[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Mon Apr 11 01:49:48 UTC 2011


#### ChangeSet ####
2011-04-10 18:45:38-07:00, harlan at hms-mbp.local
  [Bug 1881] describe the {+,-,s} characters in configure --help output

==== ChangeLog ====
2011-04-10 18:45:34-07:00, harlan at hms-mbp.local +1 -0
  [Bug 1881] describe the {+,-,s} characters in configure --help output

--- 1.839/ChangeLog	2011-04-09 03:09:09 -04:00
+++ 1.840/ChangeLog	2011-04-10 21:45:34 -04:00
@@ -1,3 +1,4 @@
+* [Bug 1881] describe the {+,-,s} characters in configure --help output.
 (4.2.7p148) 2011/04/09 Released by Harlan Stenn <stenn at ntp.org>
 * Use _mkgmtime() as timegm() in the Windows port, rather than
   libntp/mktime.c's timegm().  Fixed [Bug 1875] on Windows using the old

#### ChangeSet ####
2011-04-10 18:39:40-07:00, harlan at hms-mbp.local
  Bug 1881: describe the {+,-,s} characters in configure --help output

==== configure.ac ====
2011-04-10 18:38:49-07:00, harlan at hms-mbp.local +5 -2
  Bug 1881: describe the {+,-,s} characters in configure --help output

--- 1.521/configure.ac	2011-03-25 22:03:33 -04:00
+++ 1.522/configure.ac	2011-04-10 21:38:49 -04:00
@@ -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]

==== sntp/m4/ntp_googletest.m4 ====
2011-04-10 18:39:17-07:00, harlan at hms-mbp.local +1 -1
  Bug 1881: describe the {+,-,s} characters in configure --help output

--- 1.3/sntp/m4/ntp_googletest.m4	2011-02-22 18:21:10 -05:00
+++ 1.4/sntp/m4/ntp_googletest.m4	2011-04-10 21:39:17 -04:00
@@ -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]

==== sntp/m4/ntp_libntp.m4 ====
2011-04-10 18:39:18-07:00, harlan at hms-mbp.local +10 -2
  Bug 1881: describe the {+,-,s} characters in configure --help output

--- 1.9/sntp/m4/ntp_libntp.m4	2011-04-05 03:05:48 -04:00
+++ 1.10/sntp/m4/ntp_libntp.m4	2011-04-10 21:39:18 -04:00
@@ -8,7 +8,8 @@ dnl subpackage while retaining access to
 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]
     )


More information about the bk-ntp-dev-send mailing list