m4: Revert commit d6690cc7 to libtool.m4

Reported by Benjamin Gilbert at:
<https://savannah.gnu.org/bugs/?41203>
With recent libtool, this patch did nothing but fixing the output
message of configure.
* m4/libtool.m4: Remove the special handling of NM detection when
cross-compiling mingw32 on cygwin.

diff --git a/ChangeLog b/ChangeLog
index 70b6040cb59ca9c3b0421d55905297be1e874b5d..8071426f81ada2736846b1307d30e7433a777ac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       m4: Revert commit d6690cc7 to libtool.m4
+       Reported by Benjamin Gilbert at:
+       <https://savannah.gnu.org/bugs/?41203>
+       With recent libtool, this patch did nothing but fix the output
+       message of configure.
+       * m4/libtool.m4: Remove the special handling of NM detection when
+       cross-compiling mingw32 on cygwin.
+
 2014-04-22  Daiki Ueno  <ueno@gnu.org>
 
        build: Use git-version-gen intead of version.sh

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 1946e7387ef06b8fbc2abe74923f754e7431ea1b..ecffaf778ffe835fac311a41e70cfa3ac2f2a9c6 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3404,10 +3404,7 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" \
-     && { test "$build" = "$host" \
-          || { test "$build_os" = cygwin && test "$host_os" = mingw32; }; \
-        }; then
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do