From: Harlan Stenn Date: Thu, 7 Sep 2006 06:06:36 +0000 (-0400) Subject: [Bug 695] autogen uprgrade: warn/protect macro collisions X-Git-Tag: NTP_4_2_3P39~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751807317ddc8cc0af38f09532289168bb8f3987;p=thirdparty%2Fntp.git [Bug 695] autogen uprgrade: warn/protect macro collisions bk: 44ffb6ecOUucwemoaqq0NlcR4zXqGg --- diff --git a/clockstuff/clktest-opts.def b/clockstuff/clktest-opts.def index 43e7a6d88..375287238 100644 --- a/clockstuff/clktest-opts.def +++ b/clockstuff/clktest-opts.def @@ -7,6 +7,7 @@ prog-title = "test the clock line discipline"; argument = ''; #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 4a30a8d95..d80ec5ced 100644 --- 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 54e10ebc7..caaf4b670 100644 --- 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 6809020e8..bd9263770 100644 --- 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 9c7c53254..a20fe66af 100644 --- 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 f9c2078c0..a2638986f 100644 --- 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 d3f211614..7f71d0ffc 100644 --- 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 9c9b71562..787403e76 100644 --- 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 b5ab19a74..0add6c8a2 100644 --- 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 94d4469e9..507b20237 100644 --- 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 79719f7db..8c17a74ae 100644 --- 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 9e8e0702c..3f44e1e48 100644 --- 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";