From a3f86f313e7fbae3cb909f8a477b524b5972f852 Mon Sep 17 00:00:00 2001 From: Nils Maier Date: Sat, 24 Aug 2013 19:13:54 +0200 Subject: [PATCH] Fix automake-1.14 am_aux_dir AC_USE_SYSTEM_EXTENSIONS will cause AC_PROG_CC, which is overridden by automake-1.14, which will then init (part) of automake, in particular am_aux_dir expansion, which in turn relies on ac_aux-dir, which is not initialized at this point, and thus: certain doom (or fun, depending on your POV and mood :p) Hence call AC_USE_SYSTEM_EXTENSIONS only after AM_INIT_AUTOMAKE. This, of course, caused a lot of related macro shuffling. Tested against automake-1.10 (OSX Lion/XCode version) and automake-1.14 (homebrew version) --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 37dadad6..14a7b8a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,15 @@ # Process this file with autoconf to produce a configure script. # AC_PREREQ([2.67]) -LT_PREREQ([2.2.6]) AC_INIT([aria2],[1.17.1],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/]) + +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE() AC_USE_SYSTEM_EXTENSIONS + +LT_PREREQ([2.2.6]) LT_INIT([disable-static]) dnl See versioning rule: dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html @@ -13,9 +19,6 @@ AC_SUBST(LT_REVISION, 0) AC_SUBST(LT_AGE, 0) AC_CONFIG_MACRO_DIR([m4]) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE() AM_PATH_CPPUNIT(1.10.2) AC_CONFIG_SRCDIR([src/a2io.h]) AC_CONFIG_HEADERS([config.h])