From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 20 Jun 2011 11:02:17 +0000 (-0400)
Subject: More genLocInfo cleanup
X-Git-Tag: NTP_4_2_7P185~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42760ef4af517590cbb7574967bfb76da0dbf1a5;p=thirdparty%2Fntp.git

More genLocInfo cleanup

bk: 4dff28b9q0qn0NvNvzEI_zjc__xNCQ
---

diff --git a/ChangeLog b/ChangeLog
index 1714e81a6..72f4b8e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* More genLocInfo cleanup.
 (4.2.7p184) 2011/06/20 Released by Harlan Stenn <stenn@ntp.org>
 * Added ntp_locs.m4.
 * genLocInfo improvements.
diff --git a/configure.ac b/configure.ac
index c91ecaff5..ef9c6e9c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,8 @@ AC_PROG_YACC
 
 NTP_VPATH_HACK		dnl used only by ntpd/Makefile.am
 
+NTP_LOCINFO		dnl takes over from NTP_BINDIR, in NTP_LIBNTP
+
 # So far, the only shared library we might use is libopts.
 # It's a small library - we might as well use a static version of it.
 AC_DISABLE_SHARED
diff --git a/scripts/genLocInfo b/scripts/genLocInfo
index 59e5d6bed..6ecaea7b8 100755
--- a/scripts/genLocInfo
+++ b/scripts/genLocInfo
@@ -69,6 +69,7 @@ case "$LF" in
 esac
 
 ${V}echo "Using <$LF>" >&2
+echo "GENLOCINFOFILE=$LF"
 
 ###
 
diff --git a/sntp/m4/ntp_locs.m4 b/sntp/m4/ntp_locs.m4
index ac1823fe7..71b03517c 100644
--- a/sntp/m4/ntp_locs.m4
+++ b/sntp/m4/ntp_locs.m4
@@ -11,7 +11,13 @@ AC_MSG_CHECKING([for installation directory, man sections, and man format])
 ( cd $ac_abs_confdir && scripts/genLocInfo ) > genLocInfo.i 2>genLocInfo.err
 . genLocInfo.i
 
-AC_MSG_RESULT([done])
+case "$GENLOCINFO" in
+ OK)
+    AC_MSG_RESULT([found in $GENLOCINFOFILE])
+    ;;
+ *) AC_MSG_ERROR([Problem with genLocInfo!])
+    ;;
+esac
 
 AC_SUBST(MANTAGFMT)
 AC_SUBST(NTPDATE_DB)