From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 28 Nov 2009 06:27:47 +0000 (-0500)
Subject: Cleanup from the autoconf/automake upgrades
X-Git-Tag: NTP_4_2_5P249_RC~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f0e0d0a570f1b75f2da8371eedff2a67c2b5d1;p=thirdparty%2Fntp.git

Cleanup from the autoconf/automake upgrades

bk: 4b10c2e3ZJrpzkX6Ss0jrq9amJygBQ
---

diff --git a/ChangeLog b/ChangeLog
index 684bd850a..f1d4bf4d1 100644
--- 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 3d9b06c47..0a0a89a67 100644
--- 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 cd94cebbb..c85484e1a 100644
--- 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 dbe154ced..b61d3c9b6 100644
--- 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 55504f823..6a4c26e25 100644
--- 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([.])