Dropped support for autotools build

It's just too much of a pain to maintain.

7 files changed, 26 insertions, 98 deletions

diff --git a/ChangeLog.rst b/ChangeLog.rst
index ba12304..43749ca 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,7 @@
 Unreleased Changes
 ------------------
 
+* Dropped support for building with autotools.
 * Added missing options to man page.
 
 Release 3.2.0 (2017-08-06)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 1ae5006..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = sshfs
-
-SUBDIRS = test
-
-sshfs_SOURCES = sshfs.c cache.c cache.h
-if FUSE_OPT_COMPAT
-sshfs_SOURCES += compat/fuse_opt.c compat/fuse_opt.h
-endif
-if DARWIN_COMPAT
-sshfs_SOURCES += compat/darwin_compat.c compat/darwin_compat.h
-endif
-
-sshfs_LDADD = $(SSHFS_LIBS)
-sshfs_CFLAGS = $(SSHFS_CFLAGS)
-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=31 -DLIBDIR=\"$(libdir)\" \
-                 -DIDMAP_DEFAULT="\"$(IDMAP_DEFAULT)\""
-
-EXTRA_DIST = sshfs.rst sshfs.1 meson.build ChangeLog.rst
-CLEANFILES = sshfs.1
-
-dist_man_MANS = sshfs.1
-
-sshfs.1: sshfs.rst
-	rst2man sshfs.rst sshfs.1
diff --git a/README.rst b/README.rst
index cef05de..e7ad446 100644
--- a/README.rst
+++ b/README.rst
@@ -75,22 +75,6 @@ tests requires the `py.test`_ Python module)::
 .. _Ninja: https://ninja-build.org/
 .. _`py.test`: http://www.pytest.org/
 
-Alternate Installation
-----------------------
-
-If you are not able to use Meson and Ninja, please report this to the
-sshfs 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 sshfs developers know!
-
-
 Getting Help
 ------------
 
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index d3af91e..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,44 +0,0 @@
-AC_INIT(sshfs, 3.2.0)
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign subdir-objects])
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-CFLAGS="$CFLAGS -Wall -W"
-LIBS=
-AC_SEARCH_LIBS(dlsym, [dl])
-LIBS=
-
-case "$target_os" in
-    *linux*) osname=linux;;
-    *darwin*) osname=darwin;;
-    *) osname=unknown;;
-esac
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES([SSHFS], [fuse3 >= 3.1 glib-2.0 gthread-2.0])
-have_fuse_opt_parse=no
-oldlibs="$LIBS"
-LIBS="$LIBS $SSHFS_LIBS"
-AC_CHECK_FUNC([fuse_opt_parse], [have_fuse_opt_parse=yes])
-LIBS="$oldlibs"
-if test "$have_fuse_opt_parse" = no -o "$osname" = darwin; then
-	CFLAGS="$CFLAGS -I${srcdir}/compat"
-fi
-AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
-AM_CONDITIONAL(DARWIN_COMPAT, test "$osname" = darwin)
-
-AC_CHECK_PROG(UNMOUNT_COMMAND, fusermount, fusermount -u, umount)
-
-# TODO: Figure out why we special-case this in Darwin.  Would be nice if
-# the default setting was consistent across platforms so we wouldn't need
-# to care about it here.
-case "$osname" in
-    darwin) IDMAP_DEFAULT=user ;;
-    *) IDMAP_DEFAULT=none ;;
-esac
-AC_SUBST(IDMAP_DEFAULT)
-
-AC_CONFIG_FILES([Makefile test/Makefile])
-AC_OUTPUT
diff --git a/make_release_tarball.sh b/make_release_tarball.sh
new file mode 100755
index 0000000..5dafe4a
--- /dev/null
+++ b/make_release_tarball.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Create tarball from Git tag, removing and adding
+# some files.
+#
+
+set -e
+
+if [ -z "$1" ]; then
+    TAG="$(git tag --list 'sshfs-3*' --sort=-taggerdate | head -1)"
+else
+    TAG="$1"
+fi
+
+echo "Creating release tarball for ${TAG}..."
+
+mkdir "${TAG}"
+git archive --format=tar "${TAG}" | tar -x "--directory=${TAG}"
+find "${TAG}" -name .gitignore -delete
+rm "${TAG}/make_release_tarball.sh" \
+   "${TAG}/.travis.yml" \
+   "${TAG}/test/travis-*.sh"
+tar -cJf "${TAG}.tar.xz" "${TAG}/"
+gpg --armor --detach-sign "${TAG}.tar.xz"
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 8cf26e2..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST = meson.build conftest.py pytest.ini test_sshfs.py \
-	     util.py wrong_command.c
diff --git a/test/travis-build.sh b/test/travis-build.sh
index ba04295..c4ed185 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -36,13 +36,6 @@ for san in undefined address; do
     meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
     ninja
     ${TEST_CMD}
+    sudo ninja install
     cd ..
 done
-
-# Autotools build
-CC=gcc
-autoreconf -i
-./configure
-make
-${TEST_CMD}
-sudo make install