[ntp:bk-ntp-dev-send] BitKeeper diffs
Harlan Stenn
stenn at deacon.udel.edu
Tue Feb 22 07:04:19 UTC 2011
#### ChangeSet ####
2011-02-22 06:06:28+00:00, davehart at shiny.ad.hartbrothers.com
[Bug 1832] ntpdate doesn't allow timeout > 2s.
[Bug 1833] The checking sem_timedwait() fails without -pthread.
Enable all relevant automake warnings.
Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
triggering warnings due to excess braces.
Remove libevent-cfg from sntp/Makefile.am.
Provide bug report and URL options to Autoconf.
==== ChangeLog ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +7 -1
[Bug 1832] ntpdate doesn't allow timeout > 2s.
[Bug 1833] The checking sem_timedwait() fails without -pthread.
Enable all relevant automake warnings.
Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
triggering warnings due to excess braces.
Remove libevent-cfg from sntp/Makefile.am.
Provide bug report and URL options to Autoconf.
--- 1.792/ChangeLog 2011-02-21 06:03:31 -05:00
+++ 1.793/ChangeLog 2011-02-22 01:06:25 -05:00
@@ -1,4 +1,10 @@
-* Remove libevent-cfg from sntp/Makefile.am .
+* [Bug 1832] ntpdate doesn't allow timeout > 2s.
+* [Bug 1833] The checking sem_timedwait() fails without -pthread.
+* Enable all relevant automake warnings.
+* Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
+ triggering warnings due to excess braces.
+* Remove libevent-cfg from sntp/Makefile.am.
+* Provide bug report and URL options to Autoconf.
(4.2.7p131) 2011/02/21 Released by Harlan Stenn <stenn at ntp.org>
* [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp.
* [Bug 1088] sntp should (only) report the time difference without -s/-a.
==== Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +1 -3
Enable all relevant automake warnings.
--- 1.105/Makefile.am 2011-02-20 15:22:28 -05:00
+++ 1.106/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,6 +1,4 @@
-## LIBOPTS_CHECK_NOBUILD works with Automake 1.10 now
-AUTOMAKE_OPTIONS = foreign 1.10
-ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/libopts/m4 -I sntp/libevent/m4
+ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/libevent/m4 -I sntp/libopts/m4
NULL =
==== adjtimed/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +7 -10
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.10/adjtimed/Makefile.am 2011-02-20 15:22:29 -05:00
+++ 1.11/adjtimed/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=
+## adjtimed Makefile.am
if NTP_BINSUBDIR_IS_BIN
bin_PROGRAMS= @MAKE_ADJTIMED@
@@ -10,17 +10,13 @@ BUILT_SOURCES= check-libntp
CLEANFILES=
EXTRA_PROGRAMS= adjtimed
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
-LDADD= ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
-ETAGS_ARGS= Makefile.am
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
check-libntp: FRC
cd ../libntp && $(MAKE)
@@ -29,3 +25,4 @@ FRC:
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== clockstuff/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +7 -9
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.17/clockstuff/Makefile.am 2011-02-20 15:22:29 -05:00
+++ 1.18/clockstuff/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS =
noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
EXTRA_PROGRAMS = propdelay chutest clktest
@@ -7,16 +6,13 @@ EXTRA_DIST = clktest-opts.def
clktest_SOURCES = clktest.c clktest-opts.c clktest-opts.h
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
-LDADD = ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
propdelay_LDADD = $(LIBM) $(LDADD)
run_ag= cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" \
@@ -47,4 +43,6 @@ FRC:
cd ../libntp && $(MAKE)
CLEANFILES =
+
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== configure.ac ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +11 -4
Pass automake options via AM_INIT_AUTOMAKE so they apply to all Makefile.am
without requiring duplicative AUTOMAKE_OPTIONS = lines.
Enable all relevant automake warnings.
--- 1.515/configure.ac 2011-02-20 15:22:28 -05:00
+++ 1.516/configure.ac 2011-02-22 01:06:25 -05:00
@@ -1,8 +1,14 @@
-dnl -*-fundamental-*-
-dnl Process this file with autoconf to produce a configure script.
+dnl NTP top-level configure.ac -*- Autoconf -*-
+dnl
m4_include([sntp/m4/version.m4])
AC_PREREQ([2.61])
-AC_INIT([ntp], [VERSION_NUMBER])
+AC_INIT(
+ [ntp],
+ [VERSION_NUMBER],
+ [http://bugs.ntp.org./],
+ [],
+ [http://www.ntp.org./]dnl
+)
AC_CONFIG_MACRO_DIR([sntp/m4])
AC_CONFIG_AUX_DIR([sntp/build-aux])
@@ -33,7 +39,8 @@ ntp_configure_cache_version=20110219
NTP_CACHEVERSION([main], [$ntp_configure_cache_version])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
+
dnl AM_SILENT_RULES req. automake 1.11. [yes] defaults V=0
m4_ifdef(
[AM_SILENT_RULES],
==== includes.mf ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +6 -0
BitKeeper file C:/ntp/ntp-dev-m4quote/includes.mf
--- /dev/null 2011-02-22 02:04:15 -05:00
+++ 1.1/includes.mf 2011-02-22 01:06:25 -05:00
@@ -0,0 +1,6 @@
+## includes.mf - automake fragment
+
+NTP_INCS = -I$(top_srcdir)/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include
+NTP_INCS += -I$(top_srcdir)/lib/isc/unix/include
==== includes.mf ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
==== kernel/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +0 -2
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.4/kernel/Makefile.am 2011-01-12 00:23:46 -05:00
+++ 1.5/kernel/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,4 +1,2 @@
-AUTOMAKE_OPTIONS =
SUBDIRS = sys
-ETAGS_ARGS = Makefile.am
EXTRA_DIST = chuinit.c clkinit.c tty_chu.c tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c
==== kernel/sys/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +0 -5
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.5/kernel/sys/Makefile.am 2011-01-12 00:23:46 -05:00
+++ 1.6/kernel/sys/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,7 +1,2 @@
-AUTOMAKE_OPTIONS =
noinst_HEADERS = bsd_audioirig.h chudefs.h clkdefs.h i8253.h parsestreams.h \
pcl720.h ppsclock.h timex.h tpro.h tt560_api.h
-#EXTRA_DIST= TAGS
-# HMS: Avoid bug in automake
-#ETAGS_ARGS = ""
-ETAGS_ARGS = Makefile.am
==== libntp/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +7 -11
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.60/libntp/Makefile.am 2011-02-20 15:47:37 -05:00
+++ 1.61/libntp/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS =
BUILT_SOURCES =
CLEANFILES =
noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
@@ -8,7 +7,7 @@ EXTRA_LIBRARIES = libntpsim.a
libisc_SRCS = \
$(srcdir)/../lib/isc/assertions.c \
$(srcdir)/../lib/isc/buffer.c \
- $(srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/condition.c \
+ $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c \
$(srcdir)/../lib/isc/unix/dir.c \
$(srcdir)/../lib/isc/error.c \
$(srcdir)/../lib/isc/unix/errno2result.c \
@@ -31,7 +30,7 @@ libisc_SRCS = \
$(srcdir)/../lib/isc/unix/stdtime.c \
$(srcdir)/../lib/isc/unix/strerror.c \
$(srcdir)/../lib/isc/task.c \
- $(srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/thread.c \
+ $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c \
$(srcdir)/../lib/isc/unix/time.c \
$(srcdir)/../lib/isc/sockaddr.c \
$(NULL)
@@ -119,17 +118,14 @@ libntp_a_SRCS = \
libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
EXTRA_libntp_a_SOURCES = adjtimex.c
-ETAGS_ARGS = Makefile.am
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
EXTRA_DIST = README
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== libparse/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +5 -10
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.24/libparse/Makefile.am 2011-02-20 15:22:37 -05:00
+++ 1.25/libparse/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS =
BUILT_SOURCES = check-libntp
noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
EXTRA_LIBRARIES = libparse.a libparse_kernel.a
@@ -56,16 +55,11 @@ libparse_kernel_a_LIBADD = \
kgpstolfp.o \
$(NULL)
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/kernel
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
-
-ETAGS_ARGS = Makefile.am
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/kernel
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
@@ -146,3 +140,4 @@ sys/systm.h:
sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== ntpd/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +6 -8
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.99/ntpd/Makefile.am 2011-02-20 15:22:37 -05:00
+++ 1.100/ntpd/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -9,17 +9,14 @@ endif
noinst_LIBRARIES= libntpd.a
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
# LDADD might need RESLIB and ADJLIB.
-LDADD = version.o libntpd.a @LIBPARSE@
+LDADD = version.o libntpd.a $(LIBPARSE)
AM_YFLAGS = -d -t -r all
if SAVECONFIG_ENABLED
@@ -289,3 +286,4 @@ version.o: $(ntpd_OBJECTS) ../libntp/lib
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== ntpd/refclock_true.c ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +3 -3
include system and C runtime headers before NTP's
--- 1.17/ntpd/refclock_true.c 2011-02-20 15:22:41 -05:00
+++ 1.18/ntpd/refclock_true.c 2011-02-22 01:06:25 -05:00
@@ -12,14 +12,14 @@
#if defined(REFCLOCK) && defined(CLOCK_TRUETIME)
+#include <stdio.h>
+#include <ctype.h>
+
#include "ntpd.h"
#include "ntp_io.h"
#include "ntp_refclock.h"
#include "ntp_unixtime.h"
#include "ntp_stdlib.h"
-
-#include <stdio.h>
-#include <ctype.h>
#ifdef SYS_WINNT
extern int async_write(int, const void *, unsigned int);
==== ntpdate/Makefile.am ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +6 -10
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.27/ntpdate/Makefile.am 2011-02-20 15:22:42 -05:00
+++ 1.28/ntpdate/Makefile.am 2011-02-22 01:06:25 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS=
BUILT_SOURCES= check-libntp
CLEANFILES=
@@ -14,21 +13,17 @@ EXTRA_PROGRAMS= ntptimeset
ntptimeset_SOURCES= ntptimeset.c ntptime_config.c
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
# LDADD might need RESLIB and ADJLIB
LDADD = version.o ../libntp/libntp.a
-ntpdate_LDADD = $(LDADD) @LDADD_LIBNTP@ @PTHREAD_LIBS@ $(LIBOPTS_LDADD)
-ntpdate_LDADD += $(LIBM) @LCRYPTO@
+ntpdate_LDADD = $(LDADD) $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LIBOPTS_LDADD)
+ntpdate_LDADD += $(LIBM) $(LCRYPTO)
DISTCLEANFILES= .version version.c stamp-v
noinst_HEADERS= ntpdate.h
-ETAGS_ARGS= Makefile.am
$(PROGRAMS): $(LDADD)
@@ -49,3 +44,4 @@ version.o: $(ntpdate_OBJECTS) ../libntp/
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== ntpdate/ntpdate.c ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +1 -12
[Bug 1832] ntpdate doesn't allow timeout > 2s.
--- 1.83/ntpdate/ntpdate.c 2011-02-20 15:22:42 -05:00
+++ 1.84/ntpdate/ntpdate.c 2011-02-22 01:06:25 -05:00
@@ -419,18 +419,7 @@ ntpdatemain (
} else {
sys_timeout = ((LFPTOFP(&tmp) * TIMER_HZ)
+ 0x8000) >> 16;
- /*
- * No less than 1s between requests to
- * a server to stay within ntpd's
- * default "discard minimum 1" (and 1s
- * enforcement slop). That is enforced
- * only if the nondefault limited
- * restriction is in place, such as with
- * "restrict ... limited" and "restrict
- * ... kod limited".
- */
- if (MINTIMEOUT < sys_timeout)
- sys_timeout = MINTIMEOUT;
+ sys_timeout = max(sys_timeout, MINTIMEOUT);
}
break;
case 'v':
==== ntpdate/ntpdate.h ====
2011-02-22 06:06:25+00:00, davehart at shiny.ad.hartbrothers.com +6 -3
[Bug 1832] ntpdate doesn't allow timeout > 2s.
--- 1.12/ntpdate/ntpdate.h 2010-04-16 04:04:06 -04:00
+++ 1.13/ntpdate/ntpdate.h 2011-02-22 01:06:25 -05:00
@@ -89,10 +89,13 @@ struct server {
/*
- * Some defaults
+ * No less than 2s between requests to a server to stay within ntpd's
+ * default "discard minimum 1" (and 1s enforcement slop). That is
+ * enforced only if the nondefault limited restriction is in place, such
+ * as with "restrict ... limited" and "restrict ... kod limited".
*/
-#define MINTIMEOUT (2 * TIMER_HZ) /* 2s min. between packets */
-#define DEFTIMEOUT MINTIMEOUT /* (to the same server) */
+#define MINTIMEOUT (1 * TIMER_HZ) /* 1s min. between packets */
+#define DEFTIMEOUT (2 * TIMER_HZ) /* 2s by default */
#define DEFSAMPLES 4 /* get 4 samples per server */
#define DEFPRECISION (-5) /* the precision we claim */
#define DEFMAXPERIOD 60 /* maximum time to wait */
==== ntpdc/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +8 -10
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.57/ntpdc/Makefile.am 2011-02-20 15:22:42 -05:00
+++ 1.58/ntpdc/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS=
if NTP_BINSUBDIR_IS_BIN
bin_PROGRAMS= ntpdc
@@ -11,18 +10,16 @@ EXTRA_PROGRAMS= ntpdc-layout
EXTRA_DATA= check-layout
BUILT_SOURCES= check-libntp @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
# LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a @LDADD_LIBNTP@
-ntpdc_LDADD += @PTHREAD_LIBS@ @EDITLINE_LIBS@ @LCRYPTO@
+ntpdc_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntpdc_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpdc_LDADD += $(LCRYPTO)
# ntpdc-layout doesn't need any additional libraries at all
ntpdc_layout_LDADD=
@@ -94,3 +91,4 @@ nl.c: nl_in.c nl.pl Makefile.am ../confi
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== ntpq/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +8 -10
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.53/ntpq/Makefile.am 2011-02-20 15:22:42 -05:00
+++ 1.54/ntpq/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS=
if NTP_BINSUBDIR_IS_BIN
bin_PROGRAMS= ntpq
@@ -7,18 +6,16 @@ else
sbin_PROGRAMS= ntpq
endif
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
# LDADD might need RESLIB and ADJLIB
-ntpq_LDADD = version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a @LDADD_LIBNTP@
-ntpq_LDADD += @PTHREAD_LIBS@ @EDITLINE_LIBS@ @LCRYPTO@
+ntpq_LDADD = version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a
+ntpq_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpq_LDADD += $(LCRYPTO)
noinst_HEADERS= ntpq.h
noinst_LIBRARIES= libntpq.a
libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
@@ -77,3 +74,4 @@ version.o: $(ntpq_OBJECTS) ../libntp/lib
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== ntpsnmpd/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +10 -12
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.25/ntpsnmpd/Makefile.am 2011-02-20 15:22:43 -05:00
+++ 1.26/ntpsnmpd/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS=
if NTP_BINSUBDIR_IS_BIN
bin_PROGRAMS= @MAKE_NTPSNMPD@
@@ -12,19 +11,17 @@ ntpsnmpd_SOURCES= netsnmp_daemonize.c nt
ntpsnmpd-opts.c ntpsnmpd-opts.h ntpSnmpSubagentObject.h \
ntp_snmp.h
# HMS: we probably want a version.o file here, too.
-LDADD = ../ntpq/libntpq.a ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@ @LCRYPTO@
-LDADD += @SNMP_LIBS@ $(LIBOPTS_LDADD)
+LDADD = ../ntpq/libntpq.a ../libntp/libntp.a $(LDADD_LIBNTP)
+LDADD += $(PTHREAD_LIBS) $(LCRYPTO) $(SNMP_LIBS) $(LIBOPTS_LDADD)
-INCLUDES = -I$(top_srcdir)/ntpq
-INCLUDES += -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
-INCLUDES += @SNMP_CPPFLAGS@
+AM_CFLAGS = $(SNMP_CFLAGS) $(CFLAGS_NTP)
+
+AM_CPPFLAGS = -I$(top_srcdir)/ntpq
+AM_CPPFLAGS += $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(SNMP_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
-AM_CFLAGS = @SNMP_CFLAGS@ @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
EXTRA_DIST= ntpsnmpd-opts.def ntpsnmpd.1 ntpsnmpd-opts.texi \
ntpsnmpd-opts.menu ntpv4-mib.mib
BUILT_SOURCES= check-libntp ntpsnmpd-opts.c ntpsnmpd-opts.h
@@ -67,3 +64,4 @@ FRC:
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== parseutil/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +7 -9
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.14/parseutil/Makefile.am 2011-02-20 15:22:43 -05:00
+++ 1.15/parseutil/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,19 +1,16 @@
NULL=
-AUTOMAKE_OPTIONS =
BUILT_SOURCES =
CLEANFILES =
noinst_PROGRAMS = @TESTDCF@ @DCFD@
EXTRA_PROGRAMS = testdcf dcfd
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
-LDADD = @LDADD_LIBNTP@
+AM_CFLAGS = $(CFLAGS_NTP)
+
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
+
+LDADD = $(LDADD_LIBNTP)
ETAGS_ARGS = Makefile.am
DISTCLEANFILES = $(EXTRA_PROGRAMS)
@@ -24,3 +21,4 @@ check-local: @DCFD@
esac
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== sntp/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +15 -17
Enable all relevant automake warnings.
--- 1.55/sntp/Makefile.am 2011-02-21 06:03:32 -05:00
+++ 1.56/sntp/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,27 +1,24 @@
## Makefile.am for JMK's SNTP, by Harlan Stenn
+ACLOCAL_AMFLAGS = -I m4 -I libevent/m4 -I libopts/m4
+
NULL =
-## LIBOPTS_CHECK_NOBUILD works with Automake 1.10 now
-AUTOMAKE_OPTIONS = foreign 1.10
-ACLOCAL_AMFLAGS = -I m4 -I libopts/m4 -I libevent/m4
-
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_LIBEVENT@ @CPPFLAGS_NTP@
-
-INCLUDES = -I$(top_srcdir)/../include
-INCLUDES += -I$(top_srcdir)/../lib/isc/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
+
+AM_CPPFLAGS = $(SNTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
LDADD = version.o
LDADD += $(LIBOPTS_LDADD)
-LDADD += @LDADD_LIBEVENT@
+LDADD += $(LDADD_LIBEVENT)
LDADD += $(LIBM)
-LDADD += ../libntp/libntp.a @LDADD_LIBNTP@
-LDADD += @PTHREAD_LIBS@
-LDADD += @LCRYPTO@
+LDADD += ../libntp/libntp.a
+LDADD += $(LDADD_LIBNTP)
+LDADD += $(PTHREAD_LIBS)
+LDADD += $(LCRYPTO)
run_ag = cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)" \
autogen -L include --writable
@@ -240,10 +237,11 @@ libtool: $(LIBTOOL_DEPS)
./config.status --recheck
libevent-dist-hook:
- if test -n "@NTP_FORCE_LIBEVENT_DIST@" ; then rm -rf $(distdir)/libevent/autom4te.cache $(distdir)/libevent/config.h.in~ ; find $(distdir)/libevent -type d -name SCCS -print | xargs rm -rf ; fi
+ if test -n "$(NTP_FORCE_LIBEVENT_DIST)" ; then rm -rf $(distdir)/libevent/autom4te.cache $(distdir)/libevent/config.h.in~ ; find $(distdir)/libevent -type d -name SCCS -print | xargs rm -rf ; fi
dist-hook: libevent-dist-hook
@: do-nothing action to avoid default SCCS get
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== sntp/configure.ac ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +10 -4
Pass automake options via AM_INIT_AUTOMAKE so they apply to all Makefile.am
without requiring duplicative AUTOMAKE_OPTIONS = lines.
Enable all relevant automake warnings.
--- 1.57/sntp/configure.ac 2011-02-20 15:22:44 -05:00
+++ 1.58/sntp/configure.ac 2011-02-22 01:06:26 -05:00
@@ -1,8 +1,14 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+dnl SNTP subpackage configure.ac -*- Autoconf -*-
+dnl
m4_include([m4/version.m4])
AC_PREREQ([2.61])
-AC_INIT([sntp], [VERSION_NUMBER])
+AC_INIT(
+ [sntp],
+ [VERSION_NUMBER],
+ [http://bugs.ntp.org./],
+ [],
+ [http://www.ntp.org./]dnl
+)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
@@ -33,7 +39,7 @@ sntp_configure_cache_version=20110219
NTP_CACHEVERSION([sntp], [$sntp_configure_cache_version])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu])
dnl AM_SILENT_RULES req. automake 1.11. [yes] defaults V=0
m4_ifdef(
[AM_SILENT_RULES],
==== sntp/includes.mf ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +6 -0
BitKeeper file C:/ntp/ntp-dev-m4quote/sntp/includes.mf
--- /dev/null 2011-02-22 02:04:15 -05:00
+++ 1.1/sntp/includes.mf 2011-02-22 01:06:26 -05:00
@@ -0,0 +1,6 @@
+## includes.mf - automake fragment
+
+SNTP_INCS = -I$(top_srcdir)/../include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include
+SNTP_INCS += -I$(top_srcdir)/../lib/isc/unix/include
==== sntp/includes.mf ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
==== sntp/m4/ntp_libevent.m4 ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +3 -3
$ac_configure_args is maintained with a leading space, particularly important
with Autoconf 2.61, not so much with 2.68.
--- 1.3/sntp/m4/ntp_libevent.m4 2011-02-20 15:22:48 -05:00
+++ 1.4/sntp/m4/ntp_libevent.m4 2011-02-22 01:06:26 -05:00
@@ -113,9 +113,9 @@ esac
case "$ntp_use_local_libevent" in
yes)
dnl ac_configure_args is undocumented but widely abused.
- ac_configure_args="--disable-shared $ac_configure_args"
- ac_configure_args="--disable-libevent-regress $ac_configure_args"
- ac_configure_args="--disable-libevent-install $ac_configure_args"
+ ac_configure_args=" --disable-shared${ac_configure_args}"
+ ac_configure_args=" --disable-libevent-regress${ac_configure_args}"
+ ac_configure_args=" --disable-libevent-install${ac_configure_args}"
AC_CONFIG_SUBDIRS([libevent])
;;
*)
==== sntp/m4/ntp_libntp.m4 ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +27 -10
[Bug 1833] The checking sem_timedwait() fails without -pthread.
--- 1.6/sntp/m4/ntp_libntp.m4 2011-02-21 15:51:39 -05:00
+++ 1.7/sntp/m4/ntp_libntp.m4 2011-02-22 01:06:26 -05:00
@@ -295,29 +295,44 @@ AC_FUNC_STRERROR_R
# check if we can compile with pthreads
AC_CHECK_HEADERS([semaphore.h])
-AC_CHECK_FUNCS([sem_timedwait socketpair])
+AC_CHECK_FUNCS([socketpair])
AC_ARG_ENABLE(
[thread-support],
[AS_HELP_STRING([--disable-thread-support, do not use threads])],
- ,
+ [],
[enable_thread_support=yes]
)
have_pthreads=no
-case "$enable_thread_support:$ac_cv_func_sem_timedwait" in
- yes:yes)
- OL_THREAD_CHECK(
- [
- have_pthreads=yes
+case "$enable_thread_support" in
+ yes)
+ ol_found_pthreads=no
+ OL_THREAD_CHECK([ol_found_pthreads=yes])
+ case "$ol_found_pthreads" in
+ yes)
+ saved_LIBS="$LIBS"
+ LIBS="$LTHREAD_LIBS $LIBS"
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ AC_CHECK_FUNCS([sem_timedwait])
+ LIBS="$saved_LIBS"
+ AS_UNSET([saved_LIBS])
+ CFLAGS="$saved_CFLAGS"
+ AS_UNSET([saved_CFLAGS])
+ case "$ac_cv_func_sem_timedwait" in
+ yes)
PTHREAD_LIBS="$LTHREAD_LIBS"
- ]
- )
+ have_pthreads=yes
+ esac
+ esac
esac
AC_SUBST([PTHREAD_LIBS])
case "$have_pthreads" in
yes)
CFLAGS_NTP="$CFLAGS_NTP $PTHREAD_CFLAGS"
+ saved_LIBS="$LIBS"
+ LIBS="$LTHREAD_LIBS $LIBS"
saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
AC_CHECK_SIZEOF(
[pthread_t],
,
@@ -432,6 +447,8 @@ case "$have_pthreads" in
AC_DEFINE([ISC_PLATFORM_BRACEPTHREADONCEINIT], [1],
[Enclose PTHREAD_ONCE_INIT in extra braces?])
esac
+ LIBS="$saved_LIBS"
+ AS_UNSET([saved_LIBS])
CFLAGS="$saved_CFLAGS"
AS_UNSET([saved_CFLAGS])
;;
==== sntp/tests/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +20 -17
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.20/sntp/tests/Makefile.am 2011-02-20 15:22:48 -05:00
+++ 1.21/sntp/tests/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,4 +1,5 @@
NULL =
+BUILT_SOURCES =
check_PROGRAMS =
if BUILD_SNTP
@@ -56,26 +57,25 @@ CLEANFILES = \
LDADD = \
$(LIBOPTS_LDADD) \
- @LDADD_LIBEVENT@ \
- @top_builddir@/../libntp/libntp.a \
- @LDADD_LIBNTP@ \
- @LCRYPTO@ \
- @GTEST_LDFLAGS@ \
- @GTEST_LIBS@ \
+ $(LDADD_LIBEVENT) \
+ $(top_builddir)/../libntp/libntp.a \
+ $(LDADD_LIBNTP) \
+ $(LCRYPTO) \
+ $(GTEST_LDFLAGS) \
+ $(GTEST_LIBS) \
$(sntp_SOURCES_USED) \
$(NULL)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CXXFLAGS = @GTEST_CXXFLAGS@
-AM_CPPFLAGS = @CPPFLAGS_LIBEVENT@ @GTEST_CPPFLAGS@ @CPPFLAGS_NTP@
-
-INCLUDES = $(LIBOPTS_CFLAGS)
-INCLUDES += -I$(top_srcdir)/../include
-INCLUDES += -I$(top_srcdir)/../lib/isc/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/../lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/../tests
-INCLUDES += -I$(top_srcdir)
+AM_CFLAGS = $(CFLAGS_NTP)
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
+
+AM_CPPFLAGS = $(SNTP_INCS)
+AM_CPPFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(top_srcdir)/../tests
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
+AM_CPPFLAGS += $(GTEST_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
TESTS =
@@ -87,3 +87,6 @@ TESTS_ENVIRONMENT = $(top_srcdir)/tests/
if !NTP_CROSSCOMPILE
TESTS += $(check_PROGRAMS)
endif
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== tests/libntp/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +18 -15
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.34/tests/libntp/Makefile.am 2011-02-20 15:47:39 -05:00
+++ 1.35/tests/libntp/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,25 +1,25 @@
NULL =
+BUILT_SOURCES =
+CLEANFILES =
check_PROGRAMS = tests
LDADD = \
- @top_builddir@/libntp/libntp.a \
- @LDADD_LIBNTP@ \
- @PTHREAD_LIBS@ \
- @LCRYPTO@ \
- @GTEST_LDFLAGS@ \
- @GTEST_LIBS@ \
+ $(top_builddir)/libntp/libntp.a \
+ $(LDADD_LIBNTP) \
+ $(PTHREAD_LIBS) \
+ $(LCRYPTO) \
+ $(GTEST_LDFLAGS) \
+ $(GTEST_LIBS) \
$(NULL)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CXXFLAGS = @GTEST_CXXFLAGS@
-AM_CPPFLAGS = @GTEST_CPPFLAGS@ @CPPFLAGS_NTP@
-
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += -I$(top_srcdir)/sntp
+AM_CFLAGS = $(CFLAGS_NTP)
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
+
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/sntp
+AM_CPPFLAGS += $(GTEST_CPPFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp \
libntptest.cpp \
@@ -75,3 +75,6 @@ TESTS =
if !NTP_CROSSCOMPILE
TESTS += tests
endif
+
+include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
==== util/Makefile.am ====
2011-02-22 06:06:26+00:00, davehart at shiny.ad.hartbrothers.com +8 -13
automake deprecates INCLUDES, use AM_CPPFLAGS instead
--- 1.56/util/Makefile.am 2011-02-20 15:22:49 -05:00
+++ 1.57/util/Makefile.am 2011-02-22 01:06:26 -05:00
@@ -1,5 +1,4 @@
NULL=
-AUTOMAKE_OPTIONS=
if NTP_BINSUBDIR_IS_BIN
bin_PROGRAMS= @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
@@ -12,24 +11,19 @@ endif
EXTRA_PROGRAMS= audio-pcm byteorder hist jitter kern longsize \
ntptime pps-api precision sht testrs6000 tg tg2 tickadj timetrim
-INCLUDES = -I$(top_srcdir)/include
-INCLUDES += -I$(top_srcdir)/lib/isc/include
-INCLUDES += -I$(top_srcdir)/lib/isc/@LIBISC_PTHREADS_NOTHREADS@/include
-INCLUDES += -I$(top_srcdir)/lib/isc/unix/include
-INCLUDES += $(LIBOPTS_CFLAGS)
+AM_CFLAGS = $(CFLAGS_NTP)
-AM_CFLAGS = @CFLAGS_NTP@
-AM_CPPFLAGS = @CPPFLAGS_NTP@
+AM_CPPFLAGS = $(NTP_INCS)
+AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
# LDADD might need RESLIB and ADJLIB
-LDADD= ../libntp/libntp.a @LDADD_LIBNTP@ @PTHREAD_LIBS@
+LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
tg2_LDADD= $(LIBM)
-ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a @LDADD_LIBNTP@
-ntp_keygen_LDADD += @PTHREAD_LIBS@ @LCRYPTO@
+ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LCRYPTO)
ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
-ETAGS_ARGS= Makefile.am
-#EXTRA_DIST= README TAGS
EXTRA_DIST= ntp-keygen-opts.def ntp-keygen.1 ntp-keygen-opts.texi ntp-keygen-opts.menu
BUILT_SOURCES= check-libntp ntp-keygen-opts.c ntp-keygen-opts.h
CLEANFILES=
@@ -87,3 +81,4 @@ version.o: $(ntp_keygen_OBJECTS) ../libn
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
#### ChangeSet ####
2011-02-21 20:50:01+00:00, davehart at shiny.ad.hartbrothers.com
Autoconf 2.61 workarounds
==== sntp/m4/ntp_cacheversion.m4 ====
2011-02-21 20:50:00+00:00, davehart at shiny.ad.hartbrothers.com +8 -1
Autoconf 2.61 workaround: do not use AS_UNSET with a variable variable name.
--- 1.12/sntp/m4/ntp_cacheversion.m4 2011-02-20 15:22:47 -05:00
+++ 1.13/sntp/m4/ntp_cacheversion.m4 2011-02-21 15:50:00 -05:00
@@ -59,11 +59,13 @@ AC_DEFUN_ONCE([NTP_CACHEVERSION], [
# Parent configure just created cache from empty,
# flushing would be counterproductive.
ntp_cache_flush=0;
+ ;;
esac
esac
;;
*)
# configure cache version mismatches config.cache version
+ ;;
esac
case "$ntp_cache_flush" in
@@ -100,7 +102,12 @@ AC_DEFUN_ONCE([NTP_CACHEVERSION], [
for c_varname in $c_varname_list
do
- AS_UNSET([$c_varname])
+ dnl AS_UNSET([$c_varname])
+ dnl With Autoconf 2.61 and automake 1.10.3, using AS_UNSET
+ dnl here triggers generation of a syntax error in configure.
+ dnl Once we require a newer Autoconf we can revert to the
+ dnl AS_UNSET code.
+ { eval $c_varname=; unset $c_varname; }
done
AC_MSG_NOTICE([[$cache_file saved by another version, ignored.]])
==== sntp/m4/ntp_libntp.m4 ====
2011-02-21 20:50:00+00:00, davehart at shiny.ad.hartbrothers.com +12 -13
Autoconf 2.61 workarounds: do not use [] for action-if-not-found with
AC_CHECK_LIB and AC_CHECK_FUNC
--- 1.4/sntp/m4/ntp_libntp.m4 2011-02-20 15:22:48 -05:00
+++ 1.4.1.1/sntp/m4/ntp_libntp.m4 2011-02-21 15:50:00 -05:00
@@ -357,8 +357,7 @@ case "$have_pthreads" in
AC_CHECK_LIB(
[c_r],
[sigwait],
- [have_sigwait=yes],
- []
+ [have_sigwait=yes]
)
esac
case "$have_sigwait" in
@@ -385,12 +384,12 @@ case "$have_pthreads" in
;;
*-solaris*)
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], [1])
- AC_CHECK_FUNC(
- [pthread_setconcurrency],
- [AC_DEFINE([CALL_PTHREAD_SETCONCURRENCY], [1],
- [why not HAVE_P_S?])],
- []
- )
+ AC_CHECK_FUNCS([pthread_setconcurrency])
+ case "$ac_cv_func_pthread_setconcurrency" in
+ yes)
+ AC_DEFINE([CALL_PTHREAD_SETCONCURRENCY], [1],
+ [why not HAVE_P_S?])
+ esac
;;
*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
AC_DEFINE([HAVE_UNIXWARE_SIGWAIT], [1], [deviant sigwait?])
@@ -407,7 +406,7 @@ case "$have_pthreads" in
*-solaris2.1[[0-9]])
AC_CACHE_CHECK(
[if extra braces are needed for PTHREAD_ONCE_INIT],
- [ntp_cv_brace_pthread_once_init],
+ [ntp_cv_braces_around_pthread_once_init],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
@@ -415,14 +414,14 @@ case "$have_pthreads" in
]],
[[
static pthread_once_t once_test =
- { PTHREAD_ONCE_INIT };
+ PTHREAD_ONCE_INIT;
]]
)],
- [ntp_cv_brace_pthread_once_init=yes],
- [ntp_cv_brace_pthread_once_init=no]
+ [ntp_cv_braces_around_pthread_once_init=no],
+ [ntp_cv_braces_around_pthread_once_init=yes]
)]
)
- case "$ntp_cv_brace_pthread_once_init" in
+ case "$ntp_cv_braces_around_pthread_once_init" in
yes)
hack_shutup_pthreadonceinit=yes
esac
More information about the bk-ntp-dev-send
mailing list