[SCM] GNU Libtool branch, master, updated. v2.2.6-122-g740565c

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  740565c4fdd69be05a0a5d118bf6c77a51498bcf (commit)
      from  1f4a1d723744feddc05a77bc687366c286950651 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 740565c4fdd69be05a0a5d118bf6c77a51498bcf
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 11:42:17 2009 +0200

    testsuite: cope when some installed libltdl.la has been removed.
    
    * tests/old-m4-iface.at (AC_WITH_LTDL): Pass --with-included-ltdl
    to configure, to ensure we do not accidentally link against a
    previously installed libltdl.so where the corresponding .la
    file has been removed, thus we do not add a run path, and the
    runtime linker then fails to find libltdl.so.7.
    * tests/configure-iface.at (--with-ltdl-include/lib): Remove -L
    flags from LDFLAGS to avoid picking up an installed libltdl
    outside of the default locations.
    * THANKS: Update.
    Prompted by report from Patrice Fromy.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |   14 ++++++++++++++
 THANKS                   |    1 +
 tests/configure-iface.at |   12 ++++++++++++
 tests/old-m4-iface.at    |    6 ++++--
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7438abf..bb2989f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-06-07  Ralf Wildenhues  <address@hidden>
+
+       testsuite: cope when some installed libltdl.la has been removed.
+       * tests/old-m4-iface.at (AC_WITH_LTDL): Pass --with-included-ltdl
+       to configure, to ensure we do not accidentally link against a
+       previously installed libltdl.so where the corresponding .la
+       file has been removed, thus we do not add a run path, and the
+       runtime linker then fails to find libltdl.so.7.
+       * tests/configure-iface.at (--with-ltdl-include/lib): Remove -L
+       flags from LDFLAGS to avoid picking up an installed libltdl
+       outside of the default locations.
+       * THANKS: Update.
+       Prompted by report from Patrice Fromy.
+
 2009-06-07  Vincent Torri  <address@hidden>  (tiny change)
 
        Fix C wrapper invocation for ceGCC hosts (cegcc and mingw32ce).
diff --git a/THANKS b/THANKS
index 51c99cc..928bef5 100644
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@
   Nix                          address@hidden
   Olaf Lenz                    address@hidden
   Olly Betts                   address@hidden
+  Patrice Fromy                        address@hidden
   Patrick Welche               address@hidden
   Paul Biggar                  address@hidden
   Paul Eggert                  address@hidden
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 77e2ebc..59738e0 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -204,6 +204,18 @@ main_LDADD         = $(LIBLTDL)
 main_DEPENDENCIES      = $(LTDLDEPS) libmodule.la
 ]])
 
+## Try to avoid linking against a previously installed libltdl found
+## with an explicit -L/path.
+save_LDFLAGS=$LDFLAGS
+LDFLAGS=
+for l in $save_LDFLAGS
+do
+  case $l in
+  -L*) ;;
+  *) LDFLAGS="$LDFLAGS $l" ;;
+  esac
+done
+
 # We don't use 'libtoolize --ltdl', so that we get an error if the test
 # tries to build and link against its own ltdl sources:
 LT_AT_BOOTSTRAP([], [-I _inst/aclocal], [], [--add-missing], [],
diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index 1e374d4..64f7e60 100644
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -1,6 +1,6 @@
 # old-m4-iface.at -- exercise old m4 interface to libtool     -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
@@ -155,8 +155,10 @@ address@hidden@: address@hidden@ module.la 
libltdl/libltdlc.la
        $(LTCOMPILE) -c -o $@ $<
 ]])
 
+# Be sure to use the in-tree libltdl, somebody might have removed
+# an installed libltdl.la file.
 LT_AT_BOOTSTRAP([--ltdl --install], [-I libltdl/m4], [ignore], [ignore],
-       [--force])
+       [--force], [--with-included-ltdl])
 
 LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
 


hooks/post-receive
-- 
GNU Libtool