execute mode: do not transform *.lo or *.la arguments.

* libltdl/config/ltmain.m4sh (func_mode_execute): Do not check
arguments matching *.lo or *.la for script wrappers.
* tests/execute-mode.at (execute mode): Add tests.
* NEWS, THANKS: Update.
Report by Paul Biggar.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 10fdbd98efec840ab02f5146a6fbadafa05f05c0..53917f498c459df91c93131e01b319e877a3c27b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       execute mode: do not transform *.lo or *.la arguments.
+       * libltdl/config/ltmain.m4sh (func_mode_execute): Do not check
+       arguments matching *.lo or *.la for script wrappers.
+       * tests/execute-mode.at (execute mode): Add tests.
+       * NEWS, THANKS: Update.
+       Report by Paul Biggar.
+
        Nonexistent `main' does not guarantee link failure.
        * tests/fail.at (Failure tests): Use an unresolved symbol,
        rather than non-presence of `main', to provoke a link failure

diff --git a/NEWS b/NEWS
index 5116598073534eba77b32d8ac9520f8185da6f3a..8c3fa330ac4f1382b7c3726ccf4b73a0f1075272 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
     only the default informational output. See New Features, --no-silent.
   - Link tests are guarded by cache variables so they can be avoided for
     bootstrapping purposes (e.g., when link tests are not possible).
+  - Argument mangling of execute mode has been improved (i.e., lessened).
 
 * Miscellaneous changes:
 

diff --git a/THANKS b/THANKS
index 6acff4da434f5e9d4cbc8710988df385ff5f12d0..b6d8b705d457bc60499798cd582189c1f0aa6b58 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -122,6 +122,7 @@
   Olaf Lenz                    olenz@fias.uni-frankfurt.de
   Olly Betts                   olly@muscat.co.uk
   Patrick Welche               prlw1@newn.cam.ac.uk
+  Paul Biggar                  paul.biggar@gmail.com
   Paul Eggert                  eggert@twinsun.com
   Peter Eisentraut             peter_e@gmx.net
   Peter Jeremy                 peterjeremy@optushome.com.au

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 5f6647183f1b321d17450e7e91aacd687869ef85..d685d308131d401a26da7bd18c1226c36c811010 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1314,7 +1314,7 @@ func_mode_execute ()
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
        # Do a test to see if this is really a libtool program.
        if func_ltwrapper_script_p "$file"; then

diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index fc38ece2e55a99fca6fe138e0107dc872b682e9e..0fba29cf7187215fe91c066743dab27c128bb00b 100644 (file)
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -210,4 +210,11 @@ do
   arg1=
 done
 
+# Check that .la files are not transformed by the wrapper searching loop.
+AT_CHECK([$LIBTOOL --mode=execute echo ./main liba.lo libfakelib.la], [], [stdout])
+# This could be .libs/lt-main or similar (or just plain `main').
+AT_CHECK([grep main stdout], [], [ignore])
+AT_CHECK([grep liba.lo stdout], [], [ignore])
+AT_CHECK([grep libfakelib.la stdout], [], [ignore])
+
 AT_CLEANUP