mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-02-17 15:10:02 +08:00
* 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>.
This commit is contained in:
parent
e7c19e2e1c
commit
098ef77a20
@ -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.
|
||||
|
||||
|
8
m4/libtool.m4
vendored
8
m4/libtool.m4
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user