FYI: 38-gary-fix-ltmain-vpath.patch

[Gary V. Vaughan]

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 (AC_LIBTOOL_SETUP): Don't define the value for
        ltmain unconditionally.
        (_LT_PROG_LTMAIN): New macro to ensure that the
        shell variable `ltmain' actually points at a suitable `ltmain.sh'.
        (_AC_PROG_LIBTOOL): Require it.
        (AC_LIBTOOL_CONFIG, _LT_AC_TAG_CONFIG): Invoke it.
        * Makefile.am (libtool): ltmain.sh is in the build tree.
        * libltdl/configure.ac: Ditto.

        * ltmain.in (linkalldeplibs,darwin): Fix a bug reported by Idar
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.74
diff -u -p -u -r1.74 Makefile.am
--- Makefile.am 7 Nov 2003 15:11:51 -0000 1.74
+++ Makefile.am 11 Nov 2003 16:49:08 -0000
@@ -42,7 +42,7 @@ bin_SCRIPTS = libtool libtoolize
 
 config_status = $(top_builddir)/config.status
 
-libtool: $(srcdir)/config/ltmain.sh $(top_builddir)/configure
+libtool: config/ltmain.sh $(top_builddir)/configure
        CONFIG_FILES= CONFIG_HEADERS= $(SHELL) $(config_status)
        chmod +x $@
 
Index: libltdl/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/configure.ac,v
retrieving revision 1.9
diff -u -p -u -r1.9 configure.ac
--- libltdl/configure.ac 7 Nov 2003 16:25:56 -0000 1.9
+++ libltdl/configure.ac 11 Nov 2003 16:49:08 -0000
@@ -34,7 +34,7 @@ AC_CONFIG_SRCDIR([ltdl.c])
 ## ------------------------------- ##
 
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  if test -f ${srcdir}/ltmain.sh; then
+  if test -f ltmain.sh; then
     # if libltdl is libtoolized, it is assumed to be stand-alone and
     # installed unless the command line overrides it (tested above)
     enable_ltdl_install=yes
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.18
diff -u -p -u -r1.18 libtool.m4
--- m4/libtool.m4 10 Nov 2003 21:04:48 -0000 1.18
+++ m4/libtool.m4 11 Nov 2003 16:49:08 -0000
@@ -46,12 +46,13 @@ AC_DEFUN([AC_PROG_LIBTOOL],
 # ----------------
 AC_DEFUN([_AC_PROG_LIBTOOL],
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_REQUIRE([_LT_PROG_LTMAIN])dnl
 AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
 AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
 AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ltmain"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -62,6 +63,20 @@ define([AC_PROG_LIBTOOL], [])
 ])# _AC_PROG_LIBTOOL
 
 
+# _LT_PROG_LTMAIN
+# ---------------
+# 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.
+AC_DEFUN([_LT_PROG_LTMAIN],
+[case $ac_aux_dir in
+  $srcdir)   ltmain=./ltmain.sh ;;
+  $srcdir/*) ltmain=`expr "$ac_aux_dir" : "$srcdir/\(.*\)"`/ltmain.sh ;;
+esac
+test -f "$ltmain" || ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
 # AC_LIBTOOL_SETUP
 # ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
@@ -125,15 +140,16 @@ rm="rm -f"
 
 # Global variables:
 default_ofile=libtool
+ofile="$default_ofile"
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
+
 with_gnu_ld="$lt_cv_prog_gnu_ld"
 
+
 AC_CHECK_TOOL(AR, ar, false)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
@@ -1717,6 +1733,7 @@ m4_define([_LT_AC_TAG_CONFIG],
   ])
 
   AC_CONFIG_COMMANDS([libtool-tags], [
+    _LT_PROG_LTMAIN
     if test -f "$ltmain"; then
       if test ! -f "${ofile}"; then
         AC_MSG_ERROR([output file `$ofile' does not exist])
@@ -4197,6 +4214,7 @@ _LT_EOF
     ;;
   esac
 
+  _LT_PROG_LTMAIN
   # We use sed instead of cat because bash on DJGPP gets confused if
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
@@ -4213,7 +4231,6 @@ _LT_EOF
   PACKAGE='$PACKAGE'
   VERSION='$VERSION'
   TIMESTAMP='$TIMESTAMP'
-  ltmain='$ltmain'
   ofile='$ofile'
   sed_quote_subst='$sed_quote_subst'
   double_quote_subst='$double_quote_subst'