build: Modernize build system a bit

Do not use libtool as there's nothing needing it.
Use the tar-ustar option for AM_INIT_AUTOMAKE for better tarballs.
Correctly use ACLOCAL_FLAGS in Makefile.am instead of configure.ac.
Do not use AM_MAINTAINER_MODE as it is not recommended by automake
developers.
Do not use AC_ISC_POSIX nor AC_HEADER_STDC as they shouldn't be needed
on modern systems.

3 files changed, 3 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index d6aec08..d95348e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src man misc
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST = HACKING
 
diff --git a/autogen.sh b/autogen.sh
index dd756de..0a4f98a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,8 +46,6 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-libtoolize --copy --force
-
 echo $ACLOCAL $ACLOCAL_FLAGS
 $ACLOCAL $ACLOCAL_FLAGS
 
@@ -59,7 +57,7 @@ autoconf || echo "autoconf failed - version 2.5x is probably required"
 
 cd $ORIGDIR
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
 
 echo 
 echo "Now type 'make' to compile $PROJECT."
diff --git a/configure.ac b/configure.ac
index 264d68b..975c6c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,20 +2,12 @@ AC_INIT([desktop-file-utils], [0.19],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils])
 AC_CONFIG_SRCDIR(src/validate.h)
 
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(config.h)
 
-# Honor aclocal flags
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
-
-AM_MAINTAINER_MODE
-
 AC_PROG_CC
-AC_ISC_POSIX
-AC_HEADER_STDC
-AM_PROG_LIBTOOL
 
 if test "x$GCC" = "xyes"; then
   changequote(,)dnl