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 0fb11ea7a3813ca95598d85a63b988fe33e7f3f1..6c059895c6ef503beb81acfc4eebc9d088e69980 100644 (file)
--- 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 c9fd2284a57e3630694c2bcec980c203ac945179..7b8159d309023568d3388a7d9a0a3a4bdb21a016 100644 (file)
--- 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