From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 20 Nov 2008 06:18:38 +0000 (+0100)
Subject: Ensure $ac_aux_dir is initialized for LIBTOOL_DEPS.
X-Git-Tag: v2.2.7b~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ae7ff35f29633fd1abf6a07db8c122dedf2869b;p=thirdparty%2Flibtool.git

Ensure $ac_aux_dir is initialized for LIBTOOL_DEPS.

* libltdl/m4/libtool.m4 (LT_INIT): Require
AC_CONFIG_AUX_DIR_DEFAULT.
* tests/old-m4-iface.at (AM_PROG_LIBTOOL): Amend test to
expose this.
Report, analysis, and test example by Jakub Bogusz.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 35ca37ecc..a9c3db469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-11-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Ensure $ac_aux_dir is initialized for LIBTOOL_DEPS.
+	* libltdl/m4/libtool.m4 (LT_INIT): Require
+	AC_CONFIG_AUX_DIR_DEFAULT.
+	* tests/old-m4-iface.at (AM_PROG_LIBTOOL): Amend test to
+	expose this.
+	Report, analysis, and test example by Jakub Bogusz.
+
 	Check for bogus aclocal.m4 contents in bootstrap and dist-hook.
 	* Makefile.am (dist-hook): Bail out if shipped aclocal.m4 files
 	contain LT_INIT, AC_PROG_LIBTOOL, or AM_PROG_LIBTOOL macro
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 763a4101b..011b99c6e 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -66,6 +66,7 @@ esac
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index 3365a2ae8..1e374d4d9 100644
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -42,6 +42,7 @@ AT_SETUP([AM_PROG_LIBTOOL])
 AT_DATA([configure.in],
 [[AC_INIT(old.c)
 AM_PROG_LIBTOOL
+AC_SUBST([LIBTOOL_DEPS])
 AC_OUTPUT(Makefile)
 ]])
 
@@ -49,8 +50,9 @@ AT_DATA([Makefile.in],
 [[COMPILE = @CC@ @CPPFLAGS@ @CFLAGS@
 LINK      = @CC@ @CFLAGS@ @LDFLAGS@ -o $@
 SHELL     = @SHELL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 
-all: old@EXEEXT@
+all: libtool old@EXEEXT@
 
 old@EXEEXT@: old.@OBJEXT@
 	$(LINK) old.@OBJEXT@
@@ -60,6 +62,9 @@ old@EXEEXT@: old.@OBJEXT@
 
 .c.@OBJEXT@:
 	$(COMPILE) -c $<
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
 ]])