Fix recognition of 'link' command.

diff --git a/ChangeLog b/ChangeLog
index 72c2dac5aa5e298c2b427aab15a8fac676c4d867..7fef78d67d7a3d2e5e70d7446d39be68d46858dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-23  Bruno Haible  <bruno@clisp.org>
+
+       * m4/libtool.m4: Fix recognition of 'link' command.
+       2009-01-26  Peter Rosin  <peda@lysator.liu.se>
+               Don't settle for any dumpbin/link program as name lister.
+               * m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or
+               link -dump, check if they appear to really be capable of name
+               listing, in order to eliminate e.g. link from coreutils. This
+               makes the name lister decision fall back on nm as the default
+               if no acceptable candidate is found, which mainly happens on
+               (arguably broken) cross compiles.
+
 2009-03-14  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh: Checkout gnulib using 'git' instead of 'cvs'.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 6f12a743d479b5b7412ba329c162e716066a50e6..11f928298058ed98ff57f60861c6b3d1057b083c 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,7 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -3218,7 +3218,19 @@ if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"