From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 22 Apr 2014 06:00:24 +0000 (+0900)
Subject: m4: Apply NM detection fix from Libtool
X-Git-Tag: v0.19~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73acab394290142a84fcbe3c32d9af8d58641802;p=thirdparty%2Fgettext.git

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 8071426f8..54a66c9e5 100644
--- 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 ecffaf778..860eb7066 100644
--- 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