ChangeLog, Makefile.in, configure, configure.in:

  * configure.in: Autoconf update...

bk: 389162d3GyhlLOd6UT6E_0oIbxhIwg

diff --git a/ChangeLog b/ChangeLog
index 9c4c6c6d9669ddeb9a3ff132f0a16e6947bd4869..48030bcb2bccf13b569277b30798975b37a66bc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-01-28  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: Autoconf update...
+
        * ntpdate/ntpdate.c (ntpdatemain): Typo
        From: Jack Bryans <jbryans@csulb.edu>
 

diff --git a/Makefile.in b/Makefile.in
index fbb8f2fe9382af94d9bfb9c95a7e89dc212d5c25..decac23d69b45c51eab3867bc329ba203666a1ca 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,7 +122,7 @@ SUBDIRS = \
        util
 
 
-EXTRA_DIST = ChangeLog COPYRIGHT NEWS README.cvs README.des README.hackers TODO WHERE-TO-START acconfig.h config.guess config.h.in config.sub excludes install-sh dot.emacs build NOTES.y2kfixes readme.y2kfixes results.y2kfixes
+EXTRA_DIST = ChangeLog COPYRIGHT NEWS README.cvs README.des README.hackers TODO WHERE-TO-START acconfig.h config.guess config.h.in config.sub excludes flock-build install-sh dot.emacs build NOTES.y2kfixes readme.y2kfixes results.y2kfixes
 #ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
 ETAGS_ARGS = Makefile.am configure.in acconfig.h
 

diff --git a/configure b/configure
index 6be5d82caa6ab40e6c7cd0d41514a9fe8d8a5231..5986b003bff0feffc3f2d379c429cc4c767b75ba 100755 (executable)
--- a/configure
+++ b/configure
@@ -1088,7 +1088,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99b1
+VERSION=4.0.99b3
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -10961,9 +10961,9 @@ cat >>$CONFIG_STATUS <<EOF
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 if \$ac_need_defaults; then
-  : \${CONFIG_FILES="\$config_files"}
-  : \${CONFIG_HEADERS="\$config_headers"}
-  : \${CONFIG_COMMANDS="\$config_commands"}
+  : \${CONFIG_FILES=\$config_files}
+  : \${CONFIG_HEADERS=\$config_headers}
+  : \${CONFIG_COMMANDS=\$config_commands}
 fi
 
 # Remove all the CONFIG_FILES, and trap to remove the temp files.
@@ -10979,7 +10979,6 @@ cat >>$CONFIG_STATUS <<EOF
 
 AMDEP="$AMDEP"
 ac_aux_dir="$ac_aux_dir"
-
 EOF
 
 cat >>$CONFIG_STATUS <<EOF

diff --git a/configure.in b/configure.in
index 9624375ec73c53155d86a25a0c181683c19015c5..7e9c8d6e5b47bf381fc8a5b33f55203224030659 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,8 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99b1)
-AC_PREREQ(2.13)
+AM_INIT_AUTOMAKE(ntp, 4.0.99b3)
+AC_PREREQ(2.14)
 
 ac_cv_var_oncore_ok=no
 
@@ -2983,10 +2983,11 @@ esac
 # the ANSI2KNR-filtering rules.
 LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
 
-AC_OUTPUT(Makefile adjtimed/Makefile clockstuff/Makefile \
+AC_CONFIG_FILES(Makefile adjtimed/Makefile clockstuff/Makefile \
 include/Makefile kernel/Makefile kernel/sys/Makefile libntp/Makefile \
 libparse/Makefile librsaref/Makefile ntpd/Makefile ntpdc/Makefile \
 ntpdate/Makefile ntpq/Makefile ntptrace/Makefile parseutil/Makefile \
-scripts/Makefile scripts/mkver scripts/ntpver util/Makefile,
-[chmod +x scripts/ntpver scripts/mkver])
+scripts/Makefile scripts/mkver scripts/ntpver util/Makefile)
+AC_CONFIG_COMMANDS(default, [[chmod +x scripts/ntpver scripts/mkver]], [])
+AC_OUTPUT
 #test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])