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

  * configure.in (AC_OUTPUT): Revert to obsolete form until automake
  catches up.

bk: 388a98e2Iw96LA9mClzNs60XpMnCMg

diff --git a/ChangeLog b/ChangeLog
index e4e42137a78330be93d71a6daac69743de9b15b5..efa7392a53584899fc06563ce326d8396c6c2807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-23  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * configure.in (AC_OUTPUT): Revert to obsolete form until automake
+       catches up.
+
 2000-01-22  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: Use AC_CHECK_TYPES((s_char)) instead of

diff --git a/configure b/configure
index 93a15f9d64d91f1ad7c5e786cec252a12585847d..6be5d82caa6ab40e6c7cd0d41514a9fe8d8a5231 100755 (executable)
--- a/configure
+++ b/configure
@@ -1088,7 +1088,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99b
+VERSION=4.0.99b1
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -10979,6 +10979,7 @@ 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 b9857ee95b020cbb8d31ec1de3019bc5e434655c..9624375ec73c53155d86a25a0c181683c19015c5 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.99b)
+AM_INIT_AUTOMAKE(ntp, 4.0.99b1)
 AC_PREREQ(2.13)
 
 ac_cv_var_oncore_ok=no
@@ -2983,11 +2983,10 @@ esac
 # the ANSI2KNR-filtering rules.
 LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
 
-AC_CONFIG_FILES(Makefile adjtimed/Makefile clockstuff/Makefile \
+AC_OUTPUT(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)
-AC_CONFIG_COMMANDS(default, [[chmod +x scripts/ntpver scripts/mkver]], [])
-AC_OUTPUT
+scripts/Makefile scripts/mkver scripts/ntpver util/Makefile,
+[chmod +x scripts/ntpver scripts/mkver])
 #test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 31a0e0fda581bb8ca5f3e8749a6b2c793b675c40..c3bb68415958fa7877fadea6b076785f0f284408 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,2 +1 @@
 noinst_SCRIPTS = mkver ntpver
-EXTRA_DIST = mkver.in ntpver.in
\ No newline at end of file

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index befe0c5015da905abeebe10f9f167b7a708e9858..bc662fbe053fc73319f5c7826aac3c2fb1126284 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -100,15 +100,14 @@ install_sh = @install_sh@
 
 
 noinst_SCRIPTS = mkver ntpver
-EXTRA_DIST = mkver.in ntpver.in
 subdir = scripts
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  mkver ntpver
 SCRIPTS =  $(noinst_SCRIPTS)
 
 DIST_SOURCES = 
-DIST_COMMON =  README Makefile.am Makefile.in
+DIST_COMMON =  README Makefile.am Makefile.in mkver.in ntpver.in
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -123,6 +122,10 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+mkver: $(top_builddir)/config.status mkver.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ntpver: $(top_builddir)/config.status ntpver.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 tags: TAGS
 TAGS: