[SCM] GNU Libtool branch, master, updated. v2.4-16-g3b0fd49

[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  3b0fd490f391c88f84ba461c8cf28bd38eab3df0 (commit)
       via  5bc5f69ec6954050181f12b8e5dfb618803cd77d (commit)
       via  5798227360684931122c6f86708f6c9495752fe0 (commit)
      from  583cf628610f6b5ced8155d7f18125004e6e3b1c (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 3b0fd490f391c88f84ba461c8cf28bd38eab3df0
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Oct 14 21:27:09 2010 +0200

    Fix linking from only convenience archives with gfortran on Darwin.
    
    * libltdl/m4/libtool.m4 (_LT_DARWIN_LINKER_FEATURES): Update
    macro comment header.
    [darwin, F77, FC] <compiler_needs_object>: Set to yes if
    whole_archive_flag_spec is nonempty.  Fixes convenience.at test
    suite failures with gfortran 4.2 on Darwin.
    * THANKS: Update.
    Report by Paul Laight.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 5bc5f69ec6954050181f12b8e5dfb618803cd77d
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Oct 14 21:48:17 2010 +0200

    Fix bindir check logic, and relax non-bindir case for AIX.
    
    * tests/bindir.at (bindir install tests): Rewrite checks for
    place of the installed shared library in two separate tests,
    depending on whether -bindir is supposed to have an effect or
    not.  In the positive case, make the test stricter so that we
    reject libraries in $libdir.  In the negative case, do not
    require a major version number in the $libdir file name, for AIX
    without runtimelinking.  If tmpdir creation fails, skip the
    test.  Use fewer bindir directory names for testing, to speed
    up the test.  Also mention MSVC style DLL name in comment.
    Report by Peter Rosin.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 5798227360684931122c6f86708f6c9495752fe0
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Oct 14 21:47:44 2010 +0200

    tests: remove unneeded 'bindir compile check' test.
    
    * tests/bindir.at (bindir compile check): Remove.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog             |   26 +++++++++++++++++++++
 THANKS                |    1 +
 libltdl/m4/libtool.m4 |    6 +++-
 tests/bindir.at       |   59 +++++++++++++++++-------------------------------
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a00214c..fbd8386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-15  Ralf Wildenhues  <address@hidden>
+
+       Fix linking from only convenience archives with gfortran on Darwin.
+       * libltdl/m4/libtool.m4 (_LT_DARWIN_LINKER_FEATURES): Update
+       macro comment header.
+       [darwin, F77, FC] <compiler_needs_object>: Set to yes if
+       whole_archive_flag_spec is nonempty.  Fixes convenience.at test
+       suite failures with gfortran 4.2 on Darwin.
+       * THANKS: Update.
+       Report by Paul Laight.
+
+       Fix bindir check logic, and relax non-bindir case for AIX.
+       * tests/bindir.at (bindir install tests): Rewrite checks for
+       place of the installed shared library in two separate tests,
+       depending on whether -bindir is supposed to have an effect or
+       not.  In the positive case, make the test stricter so that we
+       reject libraries in $libdir.  In the negative case, do not
+       require a major version number in the $libdir file name, for AIX
+       without runtimelinking.  If tmpdir creation fails, skip the
+       test.  Use fewer bindir directory names for testing, to speed
+       up the test.  Also mention MSVC style DLL name in comment.
+       Report by Peter Rosin.
+
+       tests: remove unneeded 'bindir compile check' test.
+       * tests/bindir.at (bindir compile check): Remove.
+
 2010-10-14  Peter Rosin  <address@hidden>
 
        tests: fix $EXEEXT typo.
diff --git a/THANKS b/THANKS
index 5aa0c3c..c1e9968 100644
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@
   Patrick Welche               address@hidden
   Paul Biggar                  address@hidden
   Paul Eggert                  address@hidden
+  Paul Laight                  address@hidden
   Peter Eisentraut             address@hidden
   Peter Fritzsche              address@hidden
   Peter Jeremy                 address@hidden
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 967dd38..d8b3a4d 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1035,8 +1035,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1047,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do 
test  -n \"$conv\" && new_convenience=\"$new_convenience 
${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
diff --git a/tests/bindir.at b/tests/bindir.at
index 40e67cc..4e2fecc 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -1,6 +1,6 @@
 # bindir.at -  Test the -bindir option
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #   Written by Dave Korn, 2009
 #
 #   This file is part of GNU Libtool.
@@ -58,25 +58,8 @@
 # statement in libtool.m4sh around where the 'tdlname' variable is set.
 
 ####
-# Verify compiling works, and skip remaining tests if not.
-#
-
-AT_SETUP([bindir compile check])
-
-AT_DATA([simple.c] ,[[
-int main() { return 0;}
-]])
-
-$CC $CPPFLAGS $CFLAGS -o simple simple.c || noskip=false
-rm -f simple
-
-AT_CHECK([$noskip || (exit 77)])
-
-AT_CLEANUP
-
-####
-# Now run the tests themselves.  First a simple test that we can
-# build and run an executable with a couple of tiny libraries.
+# First a simple test that we can build and run an executable with a couple of
+# tiny libraries.
 
 AT_SETUP([bindir basic lib test])
 
@@ -155,14 +138,14 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o 
main$EXEEXT $CPPFLAGS $CFLAGS $LD
 # here, that will be covered by the later tests; we've rpath'd things
 # so that they can all be run in situ.
 
-LT_AT_NOINST_EXEC_CHECK([$LIBTOOL], [], [0], [ignore], [ignore], 
[--mode=execute ./main$EXEEXT])
+LT_AT_NOINST_EXEC_CHECK([./main])
 
 # Ensure libraries can be found on PATH, if we are on one
 # of the affected platforms, before testing the shared version.
 
 func_save_and_prepend_path $curdir/$objdir
 $bindirneeded && {
-  LT_AT_NOINST_EXEC_CHECK([$LIBTOOL], [], [0], [ignore], [ignore], 
[--mode=execute $objdir/main$EXEEXT])
+  LT_AT_NOINST_EXEC_CHECK([$objdir/main])
 }
 
 #  In fact, prepending the PATH as above is superfluous on the windows
@@ -199,7 +182,7 @@ case "$host_os" in
 esac
 
 eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
-AT_CHECK([test "$build_libtool_libs" = yes || (exit 77)])
+AT_CHECK([test "$build_libtool_libs" = yes || exit 77])
 
 ####
 # These routines save the PATH before a test and restore it after,
@@ -288,11 +271,15 @@ do
   AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL libfoo.la $libdir], [], 
[ignore], [ignore])
   AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL main$EXEEXT 
$curdir/sbin/main$EXEEXT], [], [ignore], [ignore])
 
-  # And ensure it went where we expect.  Could be looking for any of 
'cygfoo-0.dll',
-  # 'libfoo-0.dll', or 'libfoo.so.0'.  We'll simplify this check by taking 
advantage
-  # of the fact that if it's a DLL, it has to go in bindir, so we'll not check 
for
-  # both forms in libdir.
-  AT_CHECK([$bindirneeded && { test -f $libdir/../bin/???foo-0.dll || ls 
$libdir/../bin/*foo*0* 2>/dev/null ; } || ls $libdir/*foo*0* 2>/dev/null], [], 
[ignore], [ignore])
+  # And ensure it went where we expect.  Could be looking for any of
+  # 'cygfoo-0.dll', 'libfoo-0.dll', 'foo-0.dll', or 'libfoo.so.0'.  We'll
+  # simplify this check by taking advantage of the fact that if it's a DLL,
+  # it has to go in bindir, so we'll not check for both forms in libdir.
+  if $bindirneeded; then
+    AT_CHECK([test -f $libdir/../bin/???foo-0.dll || ls 
$libdir/../bin/*foo*0*], [], [ignore], [ignore])
+  else
+    AT_CHECK([ls $libdir/*foo*], [], [ignore], [ignore])
+  fi
 
   # And that it can be executed.
   extrapath=
@@ -304,18 +291,10 @@ do
   for bindir in \
        $curdir/usr/lib/gcc/i686-pc-cygwin/4.5.0/bin/ \
        $curdir/usr/lib/gcc/i686-pc-cygwin/4.5.0/bin \
-       $curdir/usr/lib/gcc/i686-pc-cygwin/4.5.0/ \
-       $curdir/usr/lib/gcc/i686-pc-cygwin/4.5.0 \
-       $curdir/usr/lib/gcc/i686-pc-cygwin/bin/ \
        $curdir/usr/lib/gcc/i686-pc-cygwin/bin \
-       $curdir/usr/lib/gcc/i686-pc-cygwin/ \
-       $curdir/usr/lib/gcc/i686-pc-cygwin \
-       $curdir/usr/lib/bin/ \
        $curdir/usr/lib/bin \
        $curdir/usr/bin/ \
        $curdir/usr/bin \
-       $curdir/bin/ \
-       $curdir/bin \
        /tmp/foo/bar ;
   do
 
@@ -339,7 +318,7 @@ do
         } || {
           tmp=$TMPDIR/foo$$-$RANDOM
           (umask 077 && mkdir "$tmp")
-        } || exit 77
+        } || AT_CHECK([exit 77])
         bindir=$tmp/bar
       ;;
       *)
@@ -360,7 +339,11 @@ do
     AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL main$EXEEXT 
$curdir/sbin/main$EXEEXT], [], [ignore], [ignore])
 
     # Ensure it went to bindir rather than default dir this time.
-    AT_CHECK([$bindirneeded && { test -f $bindir/???foo-0.dll || ls 
$bindir/*foo*0* 2>/dev/null ; } || ls $libdir/*foo*0* 2>/dev/null], [], 
[ignore], [ignore])
+    if $bindirneeded; then
+      AT_CHECK([test -f $bindir/???foo-0.dll || ls $bindir/*foo*0*], [], 
[ignore], [ignore])
+    else
+      AT_CHECK([ls $libdir/*foo*], [], [ignore], [ignore])
+    fi
 
     # And that it can be executed.
     extrapath=


hooks/post-receive
-- 
GNU Libtool