Cleanup from the autoconf/automake upgrades

bk: 4b10c2e3ZJrpzkX6Ss0jrq9amJygBQ

diff --git a/ChangeLog b/ChangeLog
index 684bd850a4c71ff51eb5a2fe4281010749bc32b2..f1d4bf4d1c6cb46b25a6e9ee64ec8a35a4b7ef18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Cleanup from the automake/autoconf upgrades.
 (4.2.5p248-RC) 2009/11/26 Released by Harlan Stenn <stenn@ntp.org>
 * Prepare for the generation of sntp.html.
 * Documentation changes from Dave Mills.

diff --git a/Makefile.am b/Makefile.am
index 3d9b06c47323673c1230200b86dcdc999487173b..0a0a89a67dc7777e46d88baa9d937624589022b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-AUTOMAKE_OPTIONS = foreign 1.8
+AUTOMAKE_OPTIONS = foreign 1.10
 ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
 
 NULL=

diff --git a/configure.ac b/configure.ac
index cd94cebbb81b6fd244c77b13853e56d265c7b53c..c85484e1adb9fb9dd0688e53deced5ac4fca3fba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl -*-fundamental-*-
 dnl Process this file with autoconf to produce a configure script.
 m4_include([version.m4])
-AC_PREREQ(2.53)
+AC_PREREQ(2.61)
 AC_INIT([ntp], [VERSION_NUMBER])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index dbe154cedb7cf6f98c8a3136dc31a1a6e8c25d57..b61d3c9b62fa446aa12234442b9885f03ab785ca 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL=
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.10
 ACLOCAL_AMFLAGS= -I ../m4 -I libopts/m4
 
 AM_CPPFLAGS= $(LIBOPTS_CFLAGS) -I$(top_srcdir)/../include \
@@ -47,19 +47,25 @@ sntp_SOURCES =              \
 # it's in EXTRA_DIST
 #dist_man_MANS=        sntp.1
 
-EXTRA_DIST=    bincheck.mf     \
-               COPYRIGHT       \
-               deps-ver        \
-               depsver.mf      \
-               sntp-opts.def   \
-               sntp-opts.menu  \
-               sntp-opts.texi  \
-               sntp.1          \
-               sntp.html       \
-               sntp.texi       \
+EXTRA_DIST=                            \
+               autogen-version.def     \
+               bincheck.mf             \
+               COPYRIGHT               \
+               deps-ver                \
+               depsver.mf              \
+               sntp-opts.def           \
+               sntp-opts.menu          \
+               sntp-opts.texi          \
+               sntp.1                  \
+               sntp.html               \
+               sntp.texi               \
+               version.def             \
+               version.m4              \
+               version.texi            \
                $(NULL)
+
 OLD_EXTRA_DIST=                \
-               autogen-version.def version.def version.m4
+               autogen-version.def version.def version.m4 version.texi
 
 BUILT_SOURCES=                                         \
                check-autogen-version.def               \

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 55504f8237f07422a7a19a2dbfeb486992ed9881..6a4c26e25947c8df38901cf57d1c696e36c349de 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -1,6 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 m4_include([../version.m4])
+AC_PREREQ(2.61)
 AC_INIT([sntp], [VERSION_NUMBER])
 AC_CONFIG_MACRO_DIR([../m4])
 AC_CONFIG_AUX_DIR([.])