aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Nikolaus Rath <Nikolaus@rath.org>2017-08-24 17:07:57 +0200
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2017-08-24 20:50:44 +0200
commit30ead3a5cf6405dab9d5eeac79ffe6a0e9d0aafd (patch)
tree5bffbe72317aacb3e8d6e4ac3ef4ced1585961fa
parent937467b6a06b72ee44709541f71b614ca28fa870 (diff)
Dropped support for building with autotools
It's just too much pain to keep it working.
-rw-r--r--ChangeLog.rst2
-rw-r--r--Makefile.am19
-rw-r--r--README.md19
-rw-r--r--configure.ac132
-rw-r--r--doc/Makefile.am5
-rw-r--r--example/Makefile.am21
-rw-r--r--fuse3.pc.in11
-rw-r--r--include/Makefile.am14
-rw-r--r--lib/Makefile.am43
-rwxr-xr-xmakeconf.sh26
-rw-r--r--test/Makefile.am10
-rwxr-xr-xtest/travis-build.sh8
-rw-r--r--util/Makefile.am53
13 files changed, 3 insertions, 360 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 220481b..1d9aa3c 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,8 @@
Unreleased Changes
==================
+* Support for building with autotools has been dropped.
+
* Added new `fuse_invalidate_path()` routine for cache invalidation
from the high-level FUSE API, along with an example and tests.
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index f07753a..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = @subdirs2@ doc
-
-EXTRA_DIST = \
- fuse3.pc.in \
- README* \
- test/*.py \
- test/pytest.ini \
- meson.build \
- meson_options.txt \
- ChangeLog.rst
-
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = fuse3.pc
-
-$(pkgconfig_DATA): config.status
diff --git a/README.md b/README.md
index 1ddaf0a..e9fa83f 100644
--- a/README.md
+++ b/README.md
@@ -66,23 +66,6 @@ setuid root first:
$ sudo chmod 4755 util/fusermount3
$ python3 -m pytest test/
-
-Alternate Installation
-----------------------
-
-If you are not able to use Meson and Ninja, please report this to the
-libfuse mailing list. Until the problem is resolved, you may fall back
-to an in-source build using autotools:
-
- $ ./configure
- $ make
- $ sudo make install
-
-Note that support for building with autotools may disappear at some
-point, so if you depend on using autotools for some reason please let
-the libfuse developers know!
-
-
Security implications
---------------------
@@ -156,4 +139,4 @@ Professional Support
--------------------
Professional support is available. Please contact Nikolaus Rath
-<Nikolaus@rath.org> for details. \ No newline at end of file
+<Nikolaus@rath.org> for details.
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 67357af..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,132 +0,0 @@
-AC_INIT(fuse, 3.2.0)
-AC_PREREQ(2.59d)
-AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([subdir-objects foreign])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
-AC_CONFIG_HEADERS(include/config.h)
-
-AC_PROG_LIBTOOL
-AC_PROG_CC_STDC
-AC_SYS_LARGEFILE
-AC_PROG_MKDIR_P
-AM_PROG_CC_C_O
-
-case $target_os in
- *linux*) arch=linux;;
- *netbsd*) arch=netbsd;;
- *bsd*) arch=bsd;;
- *) arch=unknown;;
-esac
-
-if test "$ac_env_CFLAGS_set" != set; then
- CFLAGS="-Wall -W -Wno-sign-compare -Wstrict-prototypes -Wmissing-declarations -Wwrite-strings -g -O2 -fno-strict-aliasing"
-fi
-
-AC_ARG_ENABLE(lib,
- [ --enable-lib Compile with library ])
-AC_ARG_ENABLE(util,
- [ --enable-util Compile with util ])
-AC_ARG_ENABLE(example,
- [ --enable-example Compile with examples ])
-AC_ARG_ENABLE(test,
- [ --enable-test Compile with tests ])
-AC_ARG_ENABLE(mtab,
- [ --disable-mtab Disable and ignore usage of /etc/mtab ])
-
-AC_ARG_WITH(pkgconfigdir,
- [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
- [pkgconfigdir=$withval],
- [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST(pkgconfigdir)
-
-subdirs2="include"
-
-if test "$enable_lib" != "no"; then
- subdirs2="$subdirs2 lib";
-fi
-if test "$arch" = linux -a "$enable_util" != "no"; then
- subdirs2="$subdirs2 util";
-fi
-if test "$enable_example" != "no"; then
- subdirs2="$subdirs2 example";
-fi
-if test "$enable_test" != "no"; then
- subdirs2="$subdirs2 test";
-fi
-if test "$enable_mtab" = "no" -o \
- "$arch" = "netbsd"; then
- AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab])
-fi
-
-AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat pipe2])
-AC_CHECK_FUNCS([posix_fallocate fstatat openat readlinkat])
-AC_CHECK_MEMBERS([struct stat.st_atim])
-AC_CHECK_MEMBERS([struct stat.st_atimespec])
-
-LIBS=
-AC_SEARCH_LIBS(dlopen, [dl])
-AC_SEARCH_LIBS(clock_gettime, [rt])
-libfuse_libs=$LIBS
-LIBS=
-AC_CHECK_LIB(ulockmgr, ulockmgr_op)
-passthrough_fh_libs=$LIBS
-AC_SUBST(passthrough_fh_libs)
-LIBS=
-
-AC_ARG_WITH([libiconv-prefix],
-[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
- ])
-AM_ICONV
-libfuse_libs="$libfuse_libs $LTLIBICONV"
-AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
-AC_SUBST(libfuse_libs)
-
-if test -z "$MOUNT_FUSE_PATH"; then
- MOUNT_FUSE_PATH='${sbindir}'
- AC_MSG_NOTICE([MOUNT_FUSE_PATH env var not set, using default $MOUNT_FUSE_PATH])
-fi
-AC_SUBST(MOUNT_FUSE_PATH)
-if test -z "$UDEV_RULES_PATH"; then
- UDEV_RULES_PATH='${libdir}/udev/rules.d'
- AC_MSG_NOTICE([UDEV_RULES_PATH env var not set, using default $UDEV_RULES_PATH])
-fi
-AC_SUBST(UDEV_RULES_PATH)
-if test -z "$INIT_D_PATH"; then
- INIT_D_PATH='${sysconfdir}/init.d'
- AC_MSG_NOTICE([INIT_D_PATH env var not set, using default $INIT_D_PATH])
-fi
-AC_SUBST(INIT_D_PATH)
-
-AC_SUBST(subdirs2)
-
-AM_CONDITIONAL(LINUX, test "$arch" = linux)
-AM_CONDITIONAL(NETBSD, test "$arch" = netbsd)
-AM_CONDITIONAL(BSD, test "$arch" = bsd)
-
-util_linux_ok=yes
-if test "$arch" = linux -a "$cross_compiling" != "yes"; then
- AC_MSG_CHECKING([if umount supports --fake --no-canonicalize])
- if umount --help 2>&1 | grep -q -- "--fake" &&
- umount --help 2>&1 | grep -q -- "--no-canonicalize"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- util_linux_ok=no
- fi
-fi
-
-AC_CONFIG_FILES([fuse3.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile test/Makefile])
-AC_OUTPUT
-
-if test "$util_linux_ok" = no; then
- AC_MSG_WARN([
-******************************************************************
-* Please install util-linux version 2.18 or later which supports *
-* --fake and --no-canonicalize options in mount and umount *
-******************************************************************])
-fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 531a6c4..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-dist_man_MANS = fusermount3.1 mount.fuse.8
-
-EXTRA_DIST = kernel.txt Doxyfile html README.NFS meson.build
diff --git a/example/Makefile.am b/example/Makefile.am
deleted file mode 100644
index 9a3940e..0000000
--- a/example/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -D_REENTRANT
-noinst_HEADERS = ioctl.h
-noinst_PROGRAMS = passthrough passthrough_fh null hello hello_ll \
- ioctl ioctl_client poll poll_client passthrough_ll \
- notify_inval_inode invalidate_path \
- notify_store_retrieve notify_inval_entry \
- cuse cuse_client printcap
-
-LDADD = ../lib/libfuse3.la
-passthrough_fh_LDADD = ../lib/libfuse3.la @passthrough_fh_libs@
-
-ioctl_client_CPPFLAGS =
-ioctl_client_LDFLAGS =
-ioctl_client_LDADD =
-poll_client_CPPFLAGS =
-poll_client_LDFLAGS =
-poll_client_LDADD =
-
-EXTRA_DIST = meson.build
diff --git a/fuse3.pc.in b/fuse3.pc.in
deleted file mode 100644
index b59a1f3..0000000
--- a/fuse3.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: fuse
-Description: Filesystem in Userspace
-Version: @VERSION@
-Libs: -L${libdir} -lfuse3 -pthread
-Libs.private: @libfuse_libs@
-Cflags: -I${includedir}/fuse3
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 5072cc3..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-fuseincludedir=$(includedir)/fuse3
-
-fuseinclude_HEADERS = \
- fuse.h \
- fuse_common.h \
- fuse_lowlevel.h \
- fuse_opt.h \
- cuse_lowlevel.h
-
-noinst_HEADERS = fuse_kernel.h
-
-EXTRA_DIST = meson.build
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index c90ec48..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
- -D_REENTRANT -DFUSE_USE_VERSION=32
-
-lib_LTLIBRARIES = libfuse3.la
-
-if BSD
-mount_source = mount_bsd.c
-else
-mount_source = mount.c mount_util.c mount_util.h
-endif
-
-if ICONV
-iconv_source = modules/iconv.c
-else
-iconv_source =
-endif
-
-libfuse3_la_SOURCES = \
- fuse.c \
- fuse_i.h \
- fuse_loop.c \
- fuse_loop_mt.c \
- fuse_lowlevel.c \
- fuse_misc.h \
- fuse_opt.c \
- fuse_signals.c \
- buffer.c \
- cuse_lowlevel.c \
- helper.c \
- modules/subdir.c \
- $(iconv_source) \
- $(mount_source)
-
-libfuse3_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 3:1:1 \
- -Wl,--version-script,$(srcdir)/fuse_versionscript
-
-if NETBSD
-libfuse3_la_LIBADD = -lperfuse -lpuffs
-endif
-
-EXTRA_DIST = fuse_versionscript meson.build
diff --git a/makeconf.sh b/makeconf.sh
deleted file mode 100755
index 3388390..0000000
--- a/makeconf.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-echo "Running libtoolize..."
-libtoolize -c
-
-# We use iconv directly rather than via gettext, so
-# we need to manually copy config.rpath.
-CONFIG_RPATH=/usr/share/gettext/config.rpath
-if ! [ -f $CONFIG_RPATH ]; then
- CONFIG_RPATH=/usr/local/share/gettext/config.rpath
-fi
-if ! [ -f $CONFIG_RPATH ]; then
- if [ -f config.rpath ]; then
- CONFIG_RPATH=
- else
- echo "config.rpath not found! - is gettext installed?" >&2
- exit 1
- fi
-fi
-if ! [ -z "$CONFIG_RPATH" ]; then
- cp "$CONFIG_RPATH" .
-fi
-
-echo "Running autoreconf..."
-autoreconf -i
-
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 6bcea43..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -D_REENTRANT
-noinst_PROGRAMS = test_syscalls test_write_cache test_setattr
-
-test_write_cache_LDADD = ../lib/libfuse3.la
-test_setattr_LDADD = ../lib/libfuse3.la
-
-EXTRA_DIST = meson.build wrong_command.c
-
diff --git a/test/travis-build.sh b/test/travis-build.sh
index dcf2421..cbc00da 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -46,14 +46,6 @@ for san in undefined address; do
cd ..
done
-# Autotools build
-CC=gcc
-./makeconf.sh
-./configure
-make
-sudo ${TEST_CMD}
-sudo make install
-
# Documentation
doxygen doc/Doxyfile
diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index 1eb2ec3..0000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = fusermount3
-noinst_PROGRAMS = mount.fuse3
-
-# we re-use mount_util.c from the library, but do want to keep ourself
-# as stand-alone as possible. in order to make an out-of-source build
-# possible, we "generate" the file from its original location by
-# copying it over.
-fusermount3_SOURCES = fusermount.c mount_util.c
-fusermount3_CPPFLAGS = -I$(top_srcdir)/lib
-BUILT_SOURCES = mount_util.c
-mount_util.c: $(top_srcdir)/lib/mount_util.c
- @cp $(top_srcdir)/lib/mount_util.c .
-
-mount_fuse3_SOURCES = mount.fuse.c
-
-install-exec-hook:
- -chmod u+s $(DESTDIR)$(bindir)/fusermount3
- @if test ! -e $(DESTDIR)/dev/fuse; then \
- $(MKDIR_P) $(DESTDIR)/dev; \
- echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
- mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
- fi
-
-EXTRA_DIST = udev.rules init_script meson.build install_helper.sh
-
-MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-UDEV_RULES_PATH = @UDEV_RULES_PATH@
-INIT_D_PATH = @INIT_D_PATH@
-
-install-exec-local:
- $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(builddir)/mount.fuse3 $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3
- $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
- $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse3
- @if test -x /usr/sbin/update-rc.d; then \
- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
- fi
-
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH)
- $(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse3.rules
-
-uninstall-local:
- rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3
- rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
- rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
- @if test -x /usr/sbin/update-rc.d; then \
- echo "/usr/sbin/update-rc.d fuse remove || true"; \
- /usr/sbin/update-rc.d fuse remove || true; \
- fi