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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 7438abfbd110677083a94bf5d5252375c86dad07..bb2989fb043125a1db9288b203fa20bfa986ac45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-06-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <vtorri@univ-evry.fr>  (tiny change)
 
        Fix C wrapper invocation for ceGCC hosts (cegcc and mingw32ce).

diff --git a/THANKS b/THANKS
index 51c99cc300a6f5ee88ae0711e7a1771193b8459c..928bef58a730b8391d19f8817d1ff5b2440aeaa5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@
   Nix                          nix@esperi.org.uk
   Olaf Lenz                    olenz@fias.uni-frankfurt.de
   Olly Betts                   olly@muscat.co.uk
+  Patrice Fromy                        patrice.fromy@u-psud.fr
   Patrick Welche               prlw1@newn.cam.ac.uk
   Paul Biggar                  paul.biggar@gmail.com
   Paul Eggert                  eggert@twinsun.com

diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 77e2ebcbb822af0a7e88dcb3f3d5371217533914..59738e0f5080ab13a49fb48a21a0329e9969a1c0 100644 (file)
--- 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 1e374d4d91f3235d95dade59d364ef18041cfaa7..64f7e60f5255de6032802882f73f02748f838a1c 100644 (file)
--- 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 @@ ltdldemo@EXEEXT@: main.@OBJEXT@ 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])