[SCM] GNU Libtool branch, master, updated. v2.2.10-31-gef76a23

[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  ef76a2349741c5793da74e7cd7aba4216af01dbc (commit)
       via  8a80206ac01d87696c61e2403aef85fc28da8c91 (commit)
       via  61aac6f3f414b11e624aa5e2fd2acebdd9677122 (commit)
      from  c4901206cff33e5e1eae76684a9d8f416df29af5 (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 ef76a2349741c5793da74e7cd7aba4216af01dbc
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jun 19 23:59:45 2010 +0200

    Fix clean mode for HP-UX 11.31 sh.
    
    * libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not try
    to match a null string in a case pattern, even with surrounding
    spaces.  Fixes `lt_dlopenadvise library loading' test.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 8a80206ac01d87696c61e2403aef85fc28da8c91
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 20 19:10:38 2010 +0200

    Add comment for exception handling module unloading issue.
    
    * tests/exceptions.at (C++ exception handling): Add comment
    for last patch.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 61aac6f3f414b11e624aa5e2fd2acebdd9677122
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jun 19 21:07:50 2010 +0200

    Fix flags test failure when ld is used as linker.
    
    * tests/flags.at (passing CC flags through libtool): When $LD
    is used for linking libraries, ensure flags passed with `-Wc,'
    are not passed through to $LD, but flags passed with `-Wl,' use
    $wl when linking programs.  Fixed testsuite failure on HP-UX
    10.20.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |   18 ++++++++++++++++++
 libltdl/config/ltmain.m4sh |    5 ++---
 tests/exceptions.at        |    1 +
 tests/flags.at             |   25 +++++++++++++++++++------
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17a1406..9bc84c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-06-20  Ralf Wildenhues  <address@hidden>
+
+       Fix clean mode for HP-UX 11.31 sh.
+       * libltdl/config/ltmain.m4sh (func_mode_uninstall): Do not try
+       to match a null string in a case pattern, even with surrounding
+       spaces.  Fixes `lt_dlopenadvise library loading' test.
+
+       Add comment for exception handling module unloading issue.
+       * tests/exceptions.at (C++ exception handling): Add comment
+       for last patch.
+
+       Fix flags test failure when ld is used as linker.
+       * tests/flags.at (passing CC flags through libtool): When $LD
+       is used for linking libraries, ensure flags passed with `-Wc,'
+       are not passed through to $LD, but flags passed with `-Wl,' use
+       $wl when linking programs.  Fixed testsuite failure on HP-UX
+       10.20.
+
 2010-06-19  Charles Wilson  <address@hidden>
 
        [cygwin] Fix segfault in C++ exception handling test
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index acb6e25..a325e27 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -8018,10 +8018,9 @@ func_mode_uninstall ()
 
          case "$mode" in
          clean)
-           case "  $library_names " in
-           # "  " in the beginning catches empty $dlname
+           case " $library_names " in
            *" $dlname "*) ;;
-           *) rmfiles="$rmfiles $odir/$dlname" ;;
+           *) test -n "$dlname" && rmfiles="$rmfiles $odir/$dlname" ;;
            esac
            test -n "$libdir" && rmfiles="$rmfiles $odir/$name $odir/${name}i"
            ;;
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 23442a3..aaebd0f 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -211,6 +211,7 @@ int exceptions_in_module (void)
     exception_caught = true;
   }
 
+  /* Only close the module after all of its objects have gone out of scope. */
   if (exception_caught)
   {
     if (lt_dlclose (handle))
diff --git a/tests/flags.at b/tests/flags.at
index 7f600be..f865757 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -73,8 +73,8 @@ AT_CHECK([$LIBTOOL --tag=lt_tag --mode=compile $compile -c 
$source],
 # Linker flags are prefixed with ${wl} iff they are passed to the
 # compiler driver, instead of directly to the linker.
 case $archive_cmds in
-*\$LD*\$linker_flags*) maybe_wl= ;;
-*) maybe_wl=$wl ;;
+*\$LD*\$linker_flags*) maybe_wl= compiler_flags_in_liblink=false ;;
+*) maybe_wl=$wl compiler_flags_in_liblink=: ;;
 esac
 
 for flag in -Wc, -Wl, '-Xcompiler ' '-Xlinker '; do
@@ -83,19 +83,32 @@ for flag in -Wc, -Wl, '-Xcompiler ' '-Xlinker '; do
     AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=compile $compile ]dnl
             [$flag-foo -c $source], [], [stdout], [ignore])
     AT_CHECK([$FGREP " -foo" stdout], [], [ignore])
-    flag_prefix=
+    flag_prefix_prog=
+    flag_prefix_lib=
+    flags_in_liblink=$compiler_flags_in_liblink
     ;;
   -Wl, | -Xlinker\ )
-    flag_prefix=$maybe_wl
+    flag_prefix_prog=$wl
+    flag_prefix_lib=$maybe_wl
+    flags_in_liblink=:
     ;;
   esac
 
-  eval set program$EXEEXT "$library_and_module"
+  AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=link $link ]dnl
+          [-o program$EXEEXT a.lo $flag-foo], [], [stdout], [ignore])
+  AT_CHECK([$FGREP " $flag_prefix_prog-foo" stdout], [], [ignore])
+
+  eval set x "$library_and_module"
   for output
   do
+    test x = "$output" && continue
     AT_CHECK([$LIBTOOL -n --tag=lt_tag --mode=link $link ]dnl
             [-o $output a.lo -rpath /nowhere $flag-foo], [], [stdout], 
[ignore])
-    AT_CHECK([$FGREP " $flag_prefix-foo" stdout], [], [ignore])
+    if $flags_in_liblink; then
+      AT_CHECK([$FGREP " $flag_prefix_lib-foo" stdout], [], [ignore])
+    else
+      AT_CHECK([$FGREP " $flag_prefix_lib-foo" stdout], [1])
+    fi
   done
 done
 


hooks/post-receive
-- 
GNU Libtool