From f4f10a3e2bd1bd7ffda6462edef92d1d8aaebe2f Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 1 Nov 2009 13:14:08 -0500 Subject: [PATCH] build: Update for latest versions of autotools. --- Makefile.am | 2 ++ autogen.sh | 12 +++++++----- configure.ac | 9 +++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index e1c7d3a..330a764 100644 --- 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 b52b9c1..9db4e70 100755 --- 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 5494e25..9d6b209 100644 --- 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, -- 2.43.2