From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 1 Oct 2015 07:27:35 +0000 (-0400)
Subject: build system tweaks.  Harlan Stenn.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6eab91a7b22a2f98299b3f4224762135c22860;p=thirdparty%2Fntp.git

build system tweaks.  Harlan Stenn.

bk: 560ce067VHJgEqfRXd7A3saig07jNQ
---

diff --git a/ChangeLog b/ChangeLog
index ad54fc0de..675e81226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,7 +127,8 @@ fixed formatting. Tomasz Flendrich
 * gcc on older HPUX may need +allowdups.  Harlan Stenn.
 * Adding missing MCAST protection.  Harlan Stenn.
 * Disable certain test programs on certain platforms.  Harlan Stenn.
-* Implement --disable-problem-tests (off by default).  Harlan Stenn.
+* Implement --enable-problem-tests (on by default).  Harlan Stenn.
+* build system tweaks.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/Makefile.am b/Makefile.am
index 150eef5ab..43f45edbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS =		\
 	tests		\
 	$(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp --enable-local-libevent
+DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp --enable-local-libevent $(NTP_DCF)
 
 EXTRA_DIST =			\
 	$(srcdir)/COPYRIGHT	\
diff --git a/sntp/m4/ntp_problemtests.m4 b/sntp/m4/ntp_problemtests.m4
index 732e64add..4596e8505 100644
--- a/sntp/m4/ntp_problemtests.m4
+++ b/sntp/m4/ntp_problemtests.m4
@@ -13,23 +13,23 @@ case "$build" in
  *)	cross=1 ;;
 esac
 
-AC_MSG_CHECKING([if we want to disable tests with undiagnosed problems])
+AC_MSG_CHECKING([if we want to enable tests with undiagnosed problems])
 AC_ARG_ENABLE(
-    [all-tests],
+    [problem-tests],
     [AS_HELP_STRING(
-        [--disable-problem-tests],
-        [- disable tests with undiagnosed problems]
+        [--enable-problem-tests],
+        [+ enable tests with undiagnosed problems]
     )],
-    [ntp_eat=$enableval],
-    [ntp_eat=no]
+    [ntp_ept=$enableval],
+    [ntp_ept=yes]
 )
-AC_MSG_RESULT([$ntp_eat])
+AC_MSG_RESULT([$ntp_ept])
 
 AC_MSG_CHECKING([if we can run test-ntp_restrict])
 ntp_test_ntp_restrict="no"
-case "$ntp_eat:$cross:$host" in
- 0:0:*-*-solaris*) ;;
- 0:0:*-*-hpux-11.23*) ;;
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
+ no:0:*-*-hpux-11.23*) ;;
  *) ntp_test_ntp_restrict="yes" ;;
 esac
 AC_MSG_RESULT([$ntp_test_ntp_restrict])
@@ -37,8 +37,8 @@ AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes])
 
 AC_MSG_CHECKING([if we can run test-ntp_scanner])
 ntp_test_ntp_scanner="no"
-case "$ntp_eat:$cross:$host" in
- 0:0:*-*-solaris*) ;;
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
  *) ntp_test_ntp_scanner="yes" ;;
 esac
 AC_MSG_RESULT([$ntp_test_ntp_scanner])
@@ -46,8 +46,8 @@ AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes])
 
 AC_MSG_CHECKING([if we can run test-ntp_signd])
 ntp_test_ntp_signd="no"
-case "$ntp_eat:$cross:$host" in
- 0:0:*-*-solaris*) ;;
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
  *) ntp_test_ntp_signd="yes" ;;
 esac
 AC_MSG_RESULT([$ntp_test_ntp_signd])