libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: 48-gary-config-status-needs-ac-aux-dir.patch


From: Gary V. Vaughan
Subject: FYI: 48-gary-config-status-needs-ac-aux-dir.patch
Date: Wed, 19 Nov 2003 18:05:49 +0000
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20030925 Thunderbird/0.3

Applied to HEAD.
--
  ())_.  Gary V. Vaughan    gary@(lilith.warpmail.net|gnu.org)
  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/
Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * 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 <address@hidden>.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.21
diff -u -p -u -r1.21 libtool.m4
--- m4/libtool.m4 17 Nov 2003 17:20:09 -0000 1.21
+++ m4/libtool.m4 19 Nov 2003 17:56:53 -0000
@@ -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

Attachment: pgpa4fEOYkmuq.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]