From: Dave Hart <hart@ntp.org>
Date: Sun, 6 Dec 2009 20:46:44 +0000 (+0000)
Subject: [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
X-Git-Tag: NTP_4_2_7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2116f9c949a86648b5687c22dd03b79ef4e8019;p=thirdparty%2Fntp.git

[Bug 1407] configure.ac: recent GNU Make -v does not include "version".

bk: 4b1c1834ihaqmXIMoB6vtLGmIAaQhw
---

diff --git a/ChangeLog b/ChangeLog
index e24fe2177..d763bcc41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
 (4.2.5p250-RC) 2009/11/30 Released by Harlan Stenn <stenn@ntp.org>
 * sntp documentation updates.
 * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers
diff --git a/configure.ac b/configure.ac
index 636b195b4..476e7bf0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,13 +360,10 @@ esac
 case "$ac_busted_vpath_in_make$srcdir" in
  no*) ;;
  yes.) ;;
- *) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | sed -e 's/GNU Make version \(1-9.]*\).*/\1/' -e q`" in
+ *) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | grep 'GNU Make'`" in
      '')
 	AC_MSG_ERROR([building outside of the main directory requires GNU make])
-	;;
-     *) ;;
     esac
-    ;;
 esac
 
 AC_SUBST(CFLAGS)dnl