m4: Apply NM detection fix from Libtool

2013-04-28  Peter Rosin <peda@lysator.liu.se>
	libtool: break all the way out when a good nm is found
	* m4/libtool.m4 (LT_PATH_NM): Break all the way out on a good
	match.

diff --git a/ChangeLog b/ChangeLog
index 8071426f81ada2736846b1307d30e7433a777ac7..54a66c9e54a67f5c0447da72a7ab14734fb23d71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       m4: Apply NM detection fix from Libtool
+       2013-04-28  Peter Rosin <peda@lysator.liu.se>
+               libtool: break all the way out when a good nm is found
+               * m4/libtool.m4 (LT_PATH_NM): Break all the way out on a good
+               match.
+
 2014-04-22  Daiki Ueno  <ueno@gnu.org>
 
        m4: Revert commit d6690cc7 to libtool.m4

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index ecffaf778ffe835fac311a41e70cfa3ac2f2a9c6..860eb706643acf9c72171f2753ddd46efbcb04d1 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3421,13 +3421,13 @@ else
        case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
        */dev/null* | *'Invalid file or object type'*)
          lt_cv_path_NM="$tmp_nm -B"
-         break
+         break 2
          ;;
        *)
          case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
          */dev/null*)
            lt_cv_path_NM="$tmp_nm -p"
-           break
+           break 2
            ;;
          *)
            lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but