From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 19 Nov 2003 17:58:40 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_PROG_LTMAIN): Ensure config.status has a
X-Git-Tag: release-1-9b~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=098ef77a2062698216419a684febb3dc7b0c2656;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (_LT_PROG_LTMAIN): Ensure config.status has a
value for `ac_aux_dir' when automake is not used.
Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.
---

diff --git a/ChangeLog b/ChangeLog
index 040eac3e8..4c627b8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-19  Gary V. Vaughan  <gary@gnu.org>
 
+	* m4/libtool.m4 (_LT_PROG_LTMAIN): Ensure config.status has a
+	value for `ac_aux_dir' when automake is not used.
+	Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.
+
 	* configure.ac (AC_PREREQ): AS_HELP_STRING was introduced after
 	autoconf-2.57 was released.
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f3e13de1e..d7d5efd87 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -68,8 +68,14 @@ define([AC_PROG_LIBTOOL], [])
 # In libtool itself `ltmain.sh' is in the build tree, but everything else
 # ships it in the source tree, for completeness, if we find a copy in the
 # build tree use that before falling back to auxdir.
+#
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
 AC_DEFUN([_LT_PROG_LTMAIN],
-[case $ac_aux_dir in
+[_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+case $ac_aux_dir in
   $srcdir)   ltmain=./ltmain.sh ;;
   $srcdir/*) ltmain=`expr "$ac_aux_dir" : "$srcdir/\(.*\)"`/ltmain.sh ;;
 esac