From: Peter Ekberg <peda@lysator.liu.se>
Date: Wed, 21 Sep 2005 16:50:18 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (LT_PATH_NM): Fix autodetection of
X-Git-Tag: release-2-1b~507
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8af770f96e355e78206e5ea55a89f7a20947784;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (LT_PATH_NM): Fix autodetection of
dumpbin and also check for "link -dump -symbols" as a synonym
for "dumpbin -symbols".
---

diff --git a/ChangeLog b/ChangeLog
index 027c28c8a..9b83565cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-21  Peter Ekberg  <peda@lysator.liu.se>,
 
+	* libltdl/m4/libtool.m4 (LT_PATH_NM): Fix autodetection of
+	dumpbin and also check for "link -dump -symbols" as a synonym
+	for "dumpbin -symbols".
+
 	* libltdl/config/ltmain.m4sh (func_mode_uninstall): Clean
 	up $dlname as well when cleaning a uninstalled libtool
 	library. Fixes -mode=clean on Cygwin and MinGW to actually
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 984d53272..ceed3b0c2 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2906,13 +2906,13 @@ else
     fi
   done
   IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${lt_cv_path_NM=no}
 fi])
 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_TOOL(DUMPBIN, [dumpbin -symbols], :)
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"