build: Update for latest versions of autotools.

diff --git a/Makefile.am b/Makefile.am
index e1c7d3aa7e2ecbb098929beff19e5e52bf6d285f..330a7645e54d91bfa5255d86468acce36a4a0b4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src doc/man
 DISTCLEANFILES = pkg_err_file pkg_rpt_file

diff --git a/autogen.sh b/autogen.sh
index b52b9c1599055dd49e1ee771878de1ff93c31d38..9db4e70f6a7ba547e6031717d65d5ef3568330dd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,8 +6,10 @@ die()
        exit 1
 }
 
-aclocal    --force               || die "Failed to run aclocal."
-autoheader --force               || die "Failed to run autoheader."
-libtoolize --force --copy        || die "Failed to run libtoolize."
-automake   --force --add-missing || die "Failed to run automake."
-autoconf   --force               || die "Failed to run autoconf."
+test -d m4 || mkdir m4
+
+aclocal    -I m4         || die "Failed to run aclocal."
+autoheader               || die "Failed to run autoheader."
+libtoolize --copy        || die "Failed to run libtoolize."
+automake   --add-missing || die "Failed to run automake."
+autoconf                 || die "Failed to run autoconf."

diff --git a/configure.ac b/configure.ac
index 5494e25b4914d79a4636a1496df82b7005ff01e4..9d6b209ac7fd054f5cfced57b8f92ac1ebd8f304 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
-AC_PREREQ(2.60)
+AC_PREREQ([2.62])
 AC_INIT([liblbx], [0.1], [toom-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([src/lbx.c])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
@@ -15,11 +16,7 @@ if test x"$PKG_CONFIG" = x""; then
        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 fi
 
-dnl Dirty hack to disable useless C++/Fortran checks
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [:])
-
-AC_PROG_LIBTOOL
+LT_INIT
 
 # libpng
 PKG_CHECK(libpng, yes, [PNG], [libpng-config], [png.h], png,