* 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 040eac3e872356b82b37512fde9a6b4ab48e1f6e..4c627b8eb91b839fee4cf8e414cc836446f6c2cc 100644 (file)
--- 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 f3e13de1ed5f6390d4b8421bc7102cb53b4006e6..d7d5efd8735080fe986ed278c5fa9ff6447d0c25 100644 (file)
--- 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