Cleanups, fix [Bug 320]

bk: 3fe9271ep80a6K5ZEO7PGKVFKKa5EA

diff --git a/Makefile.am b/Makefile.am
index 96918fc01dd05ffd396b16965e4fbffd78361639..a0667f729f31753d4e0f00afc2fd9192ae56329c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.5
+AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
 
 SUBDIRS = \
        scripts \

diff --git a/acinclude.m4 b/acinclude.m4
index 194bf6a746905acc03397b21faa138b2629d794d..2b3f78d85bcdef99e816b1a32365dff99bf6bd78 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(hs_ULONG_CONST,
+AC_DEFUN([hs_ULONG_CONST],
 [ AH_TEMPLATE(ULONG_CONST, [How do we create unsigned long constants?])
 AC_EGREP_CPP(Circus,
  [#define ACAT(a,b)a ## b
@@ -25,7 +25,7 @@ dnl
 dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
 dnl @author Alexandre Oliva <oliva@lsd.ic.unicamp.br>
 
-AC_DEFUN(AC_DEFINE_DIR, [
+AC_DEFUN([AC_DEFINE_DIR], [
        ac_expanded=`(
            test "x$prefix" = xNONE && prefix="$ac_default_prefix"
            test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"

diff --git a/configure.in b/configure.in
index 01c3270707ad6388e7ed4ad0c65b9b523fb31050..8d06b8b210f86b1885105e26ad555bd651a9cb0f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,13 @@
 dnl -*-fundamental-*-
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ntpd/ntp_refclock.c)
+m4_include([version.m4])
+AC_INIT(ntp, VERSION_NUMBER)
+AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
 AM_CONFIG_HEADER(config.h)
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.2.0)
-AC_PREREQ(2.53)
+dnl AC_ARG_PROGRAM
+AC_PREREQ(2.58)
 
 ac_cv_var_atom_ok=no
 ac_cv_var_oncore_ok=no

diff --git a/version.m4 b/version.m4
new file mode 100644 (file)
index 0000000..d02fb45
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER],[4.2.0a])