From 47fa1cabae2bf45569e8ba14c86efc8d733a85f5 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 22 Apr 2014 14:55:39 +0900 Subject: [PATCH] m4: Revert commit d6690cc7 to libtool.m4 Reported by Benjamin Gilbert at: 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. --- ChangeLog | 10 ++++++++++ m4/libtool.m4 | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70b6040cb..8071426f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-04-22 Daiki Ueno + + m4: Revert commit d6690cc7 to libtool.m4 + Reported by Benjamin Gilbert at: + + 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 build: Use git-version-gen intead of version.sh diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 1946e7387..ecffaf778 100644 --- 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 -- 2.47.2