From: Dave Hart <hart@ntp.org>
Date: Wed, 27 Jul 2011 16:38:38 +0000 (+0000)
Subject: Do not force "legacy" when --with-locfile is not given, genLocInfo
X-Git-Tag: NTP_4_2_7P197~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e2c956bac95244d817acae0b6e5be14c72dec49;p=thirdparty%2Fntp.git

Do not force "legacy" when --with-locfile is not given, genLocInfo
  will find the correct default for the system.

bk: 4e303f0eunTAyUYCk-vKlfiE1tJcxg
---

diff --git a/ChangeLog b/ChangeLog
index 0fb11ea7a..6c059895c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 * [Bug 1975] from 4.2.6p4-RC2: libntp/mktime.c won't work with 64-bit
   time_t
 * [Bug 1976] genLocInfo writes to srcdir break 'make distcheck'.
+* Do not force "legacy" when --with-locfile is not given, genLocInfo
+  will find the correct default for the system.
 (4.2.7p196) 2011/07/27 Released by Harlan Stenn <stenn@ntp.org>
 * DEFAULT INSTALLATION DIRECTORY CHANGES ON SOME OSes: to get the old
   behavior, pass --with-locfile=legacy to 'configure'
diff --git a/sntp/m4/ntp_locinfo.m4 b/sntp/m4/ntp_locinfo.m4
index c9fd2284a..7b8159d30 100644
--- a/sntp/m4/ntp_locinfo.m4
+++ b/sntp/m4/ntp_locinfo.m4
@@ -16,12 +16,21 @@ AC_ARG_WITH(
 	[os-specific or "legacy"]
     )],
     [],
-    [with_locfile=legacy]
+    [with_locfile=no]
 )
 
-( SENTINEL_DIR="$PWD" &&	\
-  cd $srcdir/$1 &&		\
-  scripts/genLocInfo -f "$with_locfile" -d "$SENTINEL_DIR" ) > genLocInfo.i 2> genLocInfo.err
+(									\
+    SENTINEL_DIR="$PWD" &&						\
+    cd $srcdir/$1 &&							\
+    case "$with_locfile" in						\
+     yes|no|'')								\
+	scripts/genLocInfo -d "$SENTINEL_DIR"				\
+	;;								\
+     *)									\
+	scripts/genLocInfo -d "$SENTINEL_DIR" -f "$with_locfile"	\
+	;;								\
+    esac								\
+) > genLocInfo.i 2> genLocInfo.err
 . ./genLocInfo.i
 
 case "$GENLOCINFO" in