Bug 1881: describe the {+,-,s} characters in configure --help output

bk: 4da25bdcSDrFp1NaKaavaGdwzosfVw

diff --git a/configure.ac b/configure.ac
index 397b62e387e1599c9f8fd58dae1054e73ee81ab3..98b853f30fcd77e0e25622aec46444da888251e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,8 @@ AC_INIT(
 AC_CONFIG_MACRO_DIR([sntp/m4])
 AC_CONFIG_AUX_DIR([sntp/build-aux])
 
+AC_PRESERVE_HELP_ORDER
+
 # Bump ntp_configure_cache_version for each change to configure.ac or
 # .m4 files which invalidates cached values from previous configure 
 # runs.
@@ -65,7 +67,6 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_YACC
 
-NTP_LIBNTP
 NTP_VPATH_HACK         dnl used only by ntpd/Makefile.am
 
 # So far, the only shared library we might use is libopts.
@@ -89,6 +90,8 @@ case "${enable_libopts_install+set}" in
 esac
 LIBOPTS_CHECK_NOBUILD([sntp/libopts])
 
+NTP_LIBNTP
+
 AC_MSG_CHECKING([for deprecated --with-arlib])
 AC_ARG_WITH([arlib],
        AS_HELP_STRING([--with-arlib], [- deprecated, arlib not distributed]),
@@ -1336,7 +1339,7 @@ AC_ARG_ENABLE(
     [dst-minutes],
     [AS_HELP_STRING(
        [--enable-dst-minutes],
-       [n minutes per DST adjustment @<:@60@:>@])   dnl @<:@ is [, @:>@ is ]
+       [=60 minutes per DST adjustment])   dnl @<:@ is [, @:>@ is ]
     ],
     [ans=$enableval],
     [ans=60]

diff --git a/sntp/m4/ntp_googletest.m4 b/sntp/m4/ntp_googletest.m4
index 5dd28c995f54f0b7f7d784021bce5e669f1bbba8..4aa740f13e3cd83ac4ba52ad02c8c3910b6278e1 100644 (file)
--- a/sntp/m4/ntp_googletest.m4
+++ b/sntp/m4/ntp_googletest.m4
@@ -6,7 +6,7 @@ AC_ARG_WITH(
     [gtest],
     [AS_HELP_STRING(
        [--with-gtest],
-       [Use the gtest framework if it's available]
+       [Use the gtest framework (Default: if it's available)]
     )],
     [try_gtest=$withval],
     [try_gtest=yes]

diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 1516d02b870364f4f9e587ca7574367865ad7cdc..a9e3bcfb662849dd28a2de420896d8f6e33f06d3 100644 (file)
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -8,7 +8,8 @@ dnl subpackage while retaining access to such test results.
 dnl
 AC_DEFUN([NTP_LIBNTP], [
 
-AC_REQUIRE([NTP_DEBUG])
+# HMS: Move NTP_DEBUG later.
+dnl AC_REQUIRE([NTP_DEBUG])
 AC_REQUIRE([NTP_CROSSCOMPILE])
 
 # HMS: Save $LIBS and empty it.
@@ -293,12 +294,19 @@ esac
 AC_TYPE_UID_T
 AC_FUNC_STRERROR_R
 
+m4_divert_text([HELP_ENABLE],
+[AS_HELP_STRING([defaults:],
+    [+ yes, - no, s system-specific])])
+
+AC_REQUIRE([NTP_DEBUG])
+
 # check if we can compile with pthreads
 AC_CHECK_HEADERS([semaphore.h])
 AC_CHECK_FUNCS([socketpair])
 AC_ARG_ENABLE(
     [thread-support],
-    [AS_HELP_STRING([--disable-thread-support, do not use threads])],
+    [AS_HELP_STRING([--enable-thread-support],
+                   [+ use threads (if available)?])],
     [],
     [enable_thread_support=yes]
     )