[Bug 695] autogen uprgrade: warn/protect macro collisions

bk: 44ffb6ecOUucwemoaqq0NlcR4zXqGg

diff --git a/clockstuff/clktest-opts.def b/clockstuff/clktest-opts.def
index 43e7a6d882656340aeefd789316f7b62d85282a4..375287238728f7dbd5e56133040a720f16c289fd 100644 (file)
--- a/clockstuff/clktest-opts.def
+++ b/clockstuff/clktest-opts.def
@@ -7,6 +7,7 @@ prog-title     = "test the clock line discipline";
 argument       = '<tty_device>';
 
 #include copyright.def
+#include autogen-version.def
 
 detail = <<- _EODetail_
        Clktest can be used to test the clock line discipline (CLKLDISC,

diff --git a/include/Makefile.am b/include/Makefile.am
index 4a30a8d9509e64c912b91342830c2cd0615d256e..d80ec5ced1ccab87b6183e1417bf8e8408589c28 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 ETAGS_ARGS = $(srcdir)/Makefile.am
-EXTRA_DIST = copyright.def debug-opt.def version.def
+EXTRA_DIST = copyright.def debug-opt.def autogen-version.def version.def
 
 SUBDIRS = isc
 

diff --git a/include/autogen-version.def b/include/autogen-version.def
index 54e10ebc712335493937096eef39ff7fa28e52f8..caaf4b6703eb64af330fdbc4e83413910d40ffa8 100644 (file)
--- a/include/autogen-version.def
+++ b/include/autogen-version.def
@@ -1 +1,2 @@
 #assert (version-compare >= autogen-version "5.8.5")
+guard-option-names;

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 6809020e899d84b845bec17c2957265b3146d313..bd9263770b5bf046379e6a52dd6dab1529a67908 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -35,8 +35,9 @@ ETAGS_ARGS = Makefile.am
 check_PROGRAMS = @MAKE_CHECK_Y2K@
 EXTRA_PROGRAMS = check_y2k ntpdsim
 run_ag = cd $(srcdir) && autogen -L ../include
-std_def_list=  $(top_srcdir)/include/debug-opt.def     \
-               $(top_srcdir)/include/copyright.def     \
+std_def_list=  $(top_srcdir)/include/debug-opt.def             \
+               $(top_srcdir)/include/autogen-version.def       \
+               $(top_srcdir)/include/copyright.def             \
                $(top_srcdir)/include/version.def
 
 check-local: @MAKE_CHECK_Y2K@

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 9c7c532541335c7d3757ab2cf80ffc69fb4e72cc..a20fe66af2bb782c2c6ce49d2a3e10866c0d7c1b 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -20,8 +20,9 @@ BUILT_SOURCES+=       ntpdc-opts.c ntpdc-opts.h ntpdc.1 ntpdc-opts.texi       \
                ntpdc-opts.menu
 man_MANS=      ntpdc.1
 run_ag=         cd $(srcdir) && autogen -L ../include
-std_def_list=  $(top_srcdir)/include/debug-opt.def     \
-               $(top_srcdir)/include/copyright.def     \
+std_def_list=  $(top_srcdir)/include/debug-opt.def             \
+               $(top_srcdir)/include/autogen-version.def       \
+               $(top_srcdir)/include/copyright.def             \
                $(top_srcdir)/include/version.def
 
 $(srcdir)/ntpdc-opts.h: ntpdc-opts.c

diff --git a/ntpdc/ntpdc-opts.def b/ntpdc/ntpdc-opts.def
index f9c2078c0ab18e199eee81db2a07afe8b1497030..a2638986f5060997763a0f8a4815904f884f20a5 100644 (file)
--- a/ntpdc/ntpdc-opts.def
+++ b/ntpdc/ntpdc-opts.def
@@ -7,6 +7,7 @@ prog-title     = "vendor-specific NTP query program";
 argument       = '[ host ...]';
 
 #include copyright.def
+#include autogen-version.def
 
 test-main;
 

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index d3f2116143b7ed357747c47cfdfdf5ea6ba9383c..7f71d0ffcc9bd2c9c6224f1e448519c9c3df0992 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -12,8 +12,9 @@ EXTRA_DIST=   ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu
 BUILT_SOURCES= ntpq-opts.c ntpq-opts.h ntpq.1 ntpq-opts.texi ntpq-opts.menu
 man_MANS=      ntpq.1
 run_ag=         cd $(srcdir) && autogen -L ../include
-std_def_list=  $(top_srcdir)/include/debug-opt.def     \
-               $(top_srcdir)/include/copyright.def     \
+std_def_list=  $(top_srcdir)/include/debug-opt.def             \
+               $(top_srcdir)/include/autogen-version.def       \
+               $(top_srcdir)/include/copyright.def             \
                $(top_srcdir)/include/version.def
 ntpq_SOURCES=  ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index 9c9b7156268e4d453353aa9551a1937ba79ced32..787403e76979d76a62bfdadd621095b71b21feae 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -3,6 +3,7 @@
 autogen definitions options;
 
 #include copyright.def
+#include autogen-version.def
 
 prog-name      = "ntpq";
 prog-title     = "standard NTP query program";

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index b5ab19a74c3d487e4ecffcbe08fc3e663e8fa961..0add6c8a239161d8c09d3b2bcf6f5d10961bbce3 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -38,13 +38,23 @@ dist_man_MANS=      sntp.1
 
 EXTRA_DIST=    bincheck.mf     \
                COPYRIGHT       \
-               sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu version.def
-BUILT_SOURCES= check-version.def       \
+               sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu      \
+               autogen-version.def version.def
+BUILT_SOURCES= check-autogen-version.def check-version.def     \
                sntp-opts.c sntp-opts.h sntp.1 sntp-opts.texi sntp-opts.menu
 man_MANS=      sntp.1
 
 
 FRC:
+check-autogen-version.def: FRC
+       @cd $(srcdir)                                                   \
+       && test -r ../include/autogen-version.def                       \
+       && ( if cmp -s ../include/autogen-version.def autogen-version.def; \
+          then : ;                                                     \
+          else cp ../include/autogen-version.def autogen-version.def;   \
+               echo "Installing new sntp/autogen-version.def file";    \
+          fi )
+
 check-version.def: FRC
        @cd $(srcdir)                                   \
        && test -r ../include/version.def               \

diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 94d4469e9b7aa878be4d9740969ce671164db255..507b2023718d0bf38afff7bcdb1a0efa3ddca931 100644 (file)
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -2,6 +2,8 @@
 
 autogen definitions options;
 
+#include autogen-version.def
+
 copyright = {
     date  = "1970-2006";
     owner = "ntp.org";

diff --git a/util/Makefile.am b/util/Makefile.am
index 79719f7dbb8abe47d8945aa531c8b3c0d3529248..8c17a74ae90ac14657947d6bd60523b3ef34765e 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -19,8 +19,9 @@ BUILT_SOURCES=        ntp-keygen-opts.c ntp-keygen-opts.h ntp-keygen.1        \
                ntp-keygen-opts.texi ntp-keygen-opts.menu
 man_MANS=      ntp-keygen.1
 run_ag=         cd $(srcdir) && autogen -L ../include
-std_def_list=  $(top_srcdir)/include/debug-opt.def     \
-               $(top_srcdir)/include/copyright.def     \
+std_def_list=  $(top_srcdir)/include/debug-opt.def             \
+               $(top_srcdir)/include/autogen-version.def       \
+               $(top_srcdir)/include/copyright.def             \
                $(top_srcdir)/include/version.def
 
 $(srcdir)/ntp-keygen-opts.h: ntp-keygen-opts.c

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index 9e8e0702c812f479cc60996a64a4783e78d8db95..3f44e1e485e2355ca80f93e0c561e2966dc20df6 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -3,6 +3,7 @@
 autogen definitions options;
 
 #include copyright.def
+#include autogen-version.def
 
 prog-name      = "ntp-keygen";
 prog-title     = "Create a NTP host key";