[SCM] GNU Libtool branch, master, updated. v2.4.2-153-g9333e74

[Peter O'Gorman]

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  9333e74fc7b76a11ed04a19343eb5dd75a1035f3 (commit)
       via  c0c49f289f22ae670066657c60905986da3b555f (commit)
       via  96cc27eff32481be89bca4e37f43a11bf953a326 (commit)
       via  f16abb06f7425b6468b01324740a5dad8a97ec59 (commit)
       via  e444159cc04dc6721d509d9d3d6ba0bc6f9e5048 (commit)
       via  b2ccf68b01d3e6092e2b505386c50486b71e7dd6 (commit)
      from  b804ffabee2ce373d9bac6ae2b235ec68e0b55e8 (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 9333e74fc7b76a11ed04a19343eb5dd75a1035f3
Merge: c0c49f2 b804ffa
Author: Peter O'Gorman <address@hidden>
Date:   Sun Feb 19 16:21:00 2012 -0600

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/libtool

commit c0c49f289f22ae670066657c60905986da3b555f
Author: Titus von Boxberg <address@hidden>
Date:   Sun Feb 19 15:33:48 2012 -0600

    Accept clang's -stdlib linker flag.
    
    build-aux/ltmain.m4sh: Don't drop the -stdlib= flag.

commit 96cc27eff32481be89bca4e37f43a11bf953a326
Author: Juergen Reuter <address@hidden>
Date:   Tue Dec 13 19:18:08 2011 +0100

    Enable nagfor fortran compiler support
    
    * build-aux/ltmain.m4sh: nagfor compatible version string.
    * m4/libtool.m4: nagfor support.

commit f16abb06f7425b6468b01324740a5dad8a97ec59
Author: Juergen Reuter <address@hidden>
Date:   Wed Feb 1 01:31:11 2012 +0100

    Fixing -shared error message for nagfor compiler.
    
    * m4/libtool.m4: Fix -shared.

commit e444159cc04dc6721d509d9d3d6ba0bc6f9e5048
Author: Pavel (Pasha) Shamis <address@hidden>
Date:   Sun Feb 19 14:18:19 2012 -0600

    Improve debug error reporting in ltdl.
    
    * libltdl/ltdl.c: Print the error message if loading fails.

commit b2ccf68b01d3e6092e2b505386c50486b71e7dd6
Author: Peter O'Gorman <address@hidden>
Date:   Sun Feb 19 14:16:52 2012 -0600

    Deleted unneeded gitlog-to-changelog patch
    
    * gl/build-aux/gitlog-to-changelog.diff: Delete.

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

Summary of changes:
 build-aux/ltmain.m4sh                 |   12 +++++++++++-
 gl/build-aux/gitlog-to-changelog.diff |   26 --------------------------
 libltdl/ltdl.c                        |   11 +++++++++--
 m4/libtool.m4                         |   18 +++++++++++++++++-
 4 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 gl/build-aux/gitlog-to-changelog.diff

diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index ca29801..30f99f4 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -5091,9 +5091,10 @@ func_mode_link ()
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -stdlib=*            select c++ std lib with clang
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
         func_quote_for_eval "$arg"
        arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
@@ -6645,6 +6646,15 @@ func_mode_link ()
          minor_current=$func_arith_result
          xlcverstring="$wl-compatibility_version $wl$minor_current 
$wl-current_version $wl$minor_current.$revision"
          verstring="-compatibility_version $minor_current -current_version 
$minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="${wl}-compatibility_version ${wl}$minor_current 
${wl}-current_version ${wl}$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current 
-current_version $minor_current.$revision"
+                  ;;
+          esac
          ;;
 
        freebsd-aout)
diff --git a/gl/build-aux/gitlog-to-changelog.diff 
b/gl/build-aux/gitlog-to-changelog.diff
deleted file mode 100644
index 57ed4c5..0000000
--- a/gl/build-aux/gitlog-to-changelog.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnulib/build-aux/gitlog-to-changelog       2011-11-17 12:22:02.000000000 
+0700
-+++ gl/build-aux/gitlog-to-changelog   2011-11-17 12:19:01.000000000 +0700
-@@ -251,6 +251,11 @@
- 
-       my $date_line = sprintf "%s  $2\n", strftime ("%F", localtime ($1));
- 
-+      # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
-+      # `(tiny change)' annotation.
-+      my $tiny_change = grep /^Copyright-paperwork-exempt:\s+[Yy]es$/, @line;
-+      $date_line =~ s/$/  (tiny change)/ if $tiny_change;
-+
-       # Format 'Co-authored-by: A U Thor <address@hidden>' lines in
-       # standard multi-author ChangeLog format.
-       my @coauthors = grep /^Co-authored-by:.*$/, @line;
-@@ -277,9 +282,10 @@
-       $prev_date_line = $date_line;
-       @prev_coauthors = @coauthors;
- 
--      # Omit "Co-authored-by..." and "Signed-off-by..." lines.
-+      # Omit meta-data lines we've already interpreted.
-       @line = grep !/^Signed-off-by: .*>$/, @line;
-       @line = grep !/^Co-authored-by: /, @line;
-+      @line = grep !/^Copyright-paperwork-exempt: /, @line;
- 
-       # Remove leading and trailing blank lines.
-       if (@line)
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index fba276c..7f94696 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -444,8 +444,15 @@ tryall_dlopen (lt_dlhandle *phandle, const char *filename,
        handle->module = (*loader_vtable->module_open) 
(loader_vtable->dlloader_data,
                                                        filename, advise);
 #ifdef LT_DEBUG_LOADERS
-       fprintf (stderr, "  Result: %s\n",
-                handle->module ? "Success" : "Failed");
+       if (!handle->module) {
+               char *error;
+               LT__GETERROR(error);
+               fprintf (stderr, "  Result: Failed\n"
+                               "  Error message << %s >>\n",
+                               error ? error : "(null)");
+       } else {
+               fprintf (stderr, "  Result: Success\n");
+       }
 #endif
 
        if (handle->module != 0)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 3639851..ac4381c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1094,7 +1094,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test yes = "$_lt_dar_can_shared"; then
@@ -4311,6 +4311,20 @@ m4_if([$1], [CXX], [
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
@@ -4821,6 +4835,8 @@ _LT_EOF
        lf95*)                          # Lahey Fortran 8.1
          _LT_TAGVAR(whole_archive_flag_spec, $1)=
          tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
        xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal 
with xlf below)
          tmp_sharedflag='-qmkshrobj'
          tmp_addflag= ;;


hooks/post-receive
-- 
GNU Libtool