ChangeLog, aclocal.m4, configure, configure.in, ntptime.c:

  * configure.in: '99k19
  * util/ntptime.c: MNT options
  From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>

bk: 3abd2170CzEMhjBPjcksSB9SxzA81w

diff --git a/ChangeLog b/ChangeLog
index 7eac04280cb45d39faebf93f66eb23c21a1a280b..f986e0921d386a564188bc8c4ad03b4990d95943 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-03-24  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: '99k19
+
        * ntpd/refclock_atom.c (atom_ppsapi): PPS API RFC alignment patches.
        From: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
 

diff --git a/configure b/configure
index 7b7f31306d5149774d75d301e82604806ee5ac0c..5a47c73ac49bf7b50835a4f3584b826f958201bc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1393,7 +1393,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=ntp
-VERSION=4.0.99k18
+VERSION=4.0.99k19
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"

diff --git a/configure.in b/configure.in
index c96a5d2b50ac6256912c252d5e84becd0c01dd66..8beca125ea42deaedccf8d6c6c71fa988d9b4839 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99k18)
+AM_INIT_AUTOMAKE(ntp, 4.0.99k19)
 AC_PREREQ(2.49)
 
 ac_cv_var_oncore_ok=no

diff --git a/util/ntptime.c b/util/ntptime.c
index 66fae702e1404419d951b16d906a5b666f797817..2db763d7e15a976896f00d8e6612fc279a16673c 100644 (file)
--- a/util/ntptime.c
+++ b/util/ntptime.c
@@ -170,25 +170,24 @@ main(
 -t timeconstant        log2 of PLL time constant (0 .. %d)\n",
                               progname, optargs,
 #ifdef MOD_MICRO
-"-M            switch to microsecond mode\n"
+"-M            switch to microsecond mode\n",
 #else
-""
+"",
 #endif
 #ifdef MOD_NANO
-"-N            switch to nanosecond mode\n"
+"-N            switch to nanosecond mode\n",
 #else
-""
+"",
 #endif
 #ifdef NTP_API
 # if NTP_API > 3
-"-T tai_offset set TAI offset\n"
+"-T tai_offset set TAI offset\n",
 # else
-""
+"",
 # endif
 #else
-""
+"",
 #endif
-
                               MAXTC);
                exit(2);
        }