[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Thu Feb 4 06:40:02 UTC 2010


#### ChangeSet ####
2010-02-04 03:01:42+00:00, hart at psp-fb1.ntp.org 
  Makefile.am:
    fix make distdir before make all on FreeBSD make

==== Makefile.am ====
2010-02-04 03:00:00+00:00, hart at psp-fb1.ntp.org +5 -5
  fix make distdir before make all on FreeBSD make

--- 1.91/Makefile.am	2010-02-03 18:51:51 -05:00
+++ 1.92/Makefile.am	2010-02-03 22:00:00 -05:00
@@ -51,7 +51,7 @@ DIST_SUBDIRS=		\
 DISTCHECK_CONFIGURE_FLAGS = -C
 
 EXTRA_DIST =			\
-	COPYRIGHT		\
+	$(srcdir)/COPYRIGHT	\
 	ChangeLog		\
 	CommitLog		\
 	CommitLog-4.1.0		\
@@ -85,7 +85,7 @@ EXTRA_DIST =			\
 	bincheck.mf		\
 	depsver.mf		\
 	deps-ver		\
-	version			\
+	$(srcdir)/version	\
 	version.m4		\
 	\
 	$(NULL)
@@ -102,9 +102,9 @@ ETAGS_ARGS = Makefile.am configure.ac
 BUILT_SOURCES =				\
 	.gcc-warning			\
 	libtool				\
-	$(srcdir)/COPYRIGHT		\
-	$(srcdir)/version		\
-	$(srcdir)/version.m4		\
+	COPYRIGHT			\
+	version				\
+	version.m4			\
 	$(srcdir)/include/version.def	\
 	$(srcdir)/include/version.texi	\
 	$(NULL)

==== sntp/Makefile.am ====
2010-02-04 02:59:15+00:00, hart at psp-fb1.ntp.org +26 -25
  fix make distdir before make all on FreeBSD make

--- 1.21.1.5/sntp/Makefile.am	2010-02-02 03:09:04 -05:00
+++ 1.21.1.6/sntp/Makefile.am	2010-02-03 21:59:15 -05:00
@@ -48,34 +48,35 @@ sntp_SOURCES =		\
 	$(NULL)
 
 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)
+	$(srcdir)/autogen-version.def	\
+	bincheck.mf			\
+	$(srcdir)/COPYRIGHT		\
+	deps-ver			\
+	depsver.mf			\
+	sntp-opts.def			\
+	sntp-opts.menu			\
+	sntp-opts.texi			\
+	sntp.1				\
+	sntp.html			\
+	sntp.texi			\
+	$(srcdir)/version.def		\
+	$(srcdir)/version.m4		\
+	$(srcdir)/version.texi		\
+	$(NULL)
 
 OLD_EXTRA_DIST=		\
 		autogen-version.def version.def version.m4 version.texi
 
-BUILT_SOURCES=						\
-		check-autogen-version.def		\
-		check-version.def check-version.m4	\
-		check-version.texi			\
-		$(srcdir)/COPYRIGHT			\
-		libtool					\
-		sntp-opts.c				\
-		sntp-opts.h				\
-		$(NULL)
+BUILT_SOURCES=				\
+	check-autogen-version.def	\
+	check-version.def		\
+	check-version.m4		\
+	check-version.texi		\
+	COPYRIGHT			\
+	libtool				\
+	sntp-opts.c			\
+	sntp-opts.h			\
+	$(NULL)
 
 man_MANS=	$(srcdir)/sntp.1
 
@@ -145,7 +146,7 @@ $(srcdir)/../COPYRIGHT:
 
 check-COPYRIGHT-submake: $(srcdir)/../COPYRIGHT
 	@cmp -s $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
-	 || { cp $(srcdir)/../COPYRIGHT $(srcdir)/COPYRIGHT	\
+	 || { cp $(srcdir)/../COPYRIGHT $(srcdir)		\
 	      && echo 'updated sntp/COPYRIGHT installed' ;}
 	@echo 'submake avoided if this file is newer than parent COPYRIGHT' > $@
 

#### ChangeSet ####
2010-02-03 23:51:52+00:00, davehart at shiny.ad.hartbrothers.com 
  Remove arlib.

==== BitKeeper/deleted/.del-COPYING~1e5c94deb8b25a03 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/COPYING -> BitKeeper/deleted/.del-COPYING~1e5c94deb8b25a03

==== BitKeeper/deleted/.del-INSTALL~4c77da0d9f1f3464 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/INSTALL -> BitKeeper/deleted/.del-INSTALL~4c77da0d9f1f3464

==== BitKeeper/deleted/.del-Makefile.am~501d14b0d06d3031 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/Makefile.am -> BitKeeper/deleted/.del-Makefile.am~501d14b0d06d3031

==== BitKeeper/deleted/.del-README~4de4615d76ebba47 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/README -> BitKeeper/deleted/.del-README~4de4615d76ebba47

==== BitKeeper/deleted/.del-UNSHAR.HDR~6aa2f933ef5d86df ====
2010-02-03 23:50:57+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/UNSHAR.HDR -> BitKeeper/deleted/.del-UNSHAR.HDR~6aa2f933ef5d86df

==== BitKeeper/deleted/.del-arlib.3~11ae3dd9cdb6a32 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/arlib.3 -> BitKeeper/deleted/.del-arlib.3~11ae3dd9cdb6a32

==== BitKeeper/deleted/.del-arlib.c~fdde50d6ab7b6f64 ====
2010-02-03 23:50:57+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/arlib.c -> BitKeeper/deleted/.del-arlib.c~fdde50d6ab7b6f64

==== BitKeeper/deleted/.del-arlib.h~22218072d10baf8e ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/arlib.h -> BitKeeper/deleted/.del-arlib.h~22218072d10baf8e

==== BitKeeper/deleted/.del-arplib.h~8ccbd9af28d9aa3b ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/arplib.h -> BitKeeper/deleted/.del-arplib.h~8ccbd9af28d9aa3b

==== BitKeeper/deleted/.del-configure.in~282cad3ea077c564 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/configure.in -> BitKeeper/deleted/.del-configure.in~282cad3ea077c564

==== BitKeeper/deleted/.del-sample.c~4c74b15f3881e611 ====
2010-02-03 23:50:56+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
  Rename: arlib/sample.c -> BitKeeper/deleted/.del-sample.c~4c74b15f3881e611

==== ChangeLog ====
2010-02-03 23:51:51+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  Remove arlib.

--- 1.496.26.35/ChangeLog	2010-02-03 05:24:58 -05:00
+++ 1.496.26.36/ChangeLog	2010-02-03 18:51:51 -05:00
@@ -8,6 +8,7 @@
 * Convert many sprintf() calls to snprintf(), also strcpy(), strcat().
 * Fix widely cut-n-pasted bug in refclock shutdown after failed start.
 * Remove some dead code checking for emalloc() returning NULL.
+* Remove arlib.
 
 ---
 (4.2.6p1-RC3) 2010/01/24 Released by Harlan Stenn <stenn at ntp.org>

==== Makefile.am ====
2010-02-03 23:51:51+00:00, davehart at shiny.ad.hartbrothers.com +1 -4
  Remove arlib.

--- 1.90/Makefile.am	2010-02-02 03:09:04 -05:00
+++ 1.91/Makefile.am	2010-02-03 18:51:51 -05:00
@@ -1,4 +1,3 @@
-#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
 AUTOMAKE_OPTIONS = foreign 1.10
 ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
 
@@ -14,7 +13,6 @@ if NEED_LIBOPTS
 SUBDIRS+= libopts
 endif
 SUBDIRS+= 		\
-	@ARLIB_DIR@ 	\
 	libntp		\
 	libparse	\
 	ntpd		\
@@ -34,7 +32,6 @@ DIST_SUBDIRS=		\
 	scripts		\
 	include		\
 	ElectricFence	\
-	arlib		\
 	libntp		\
 	libopts		\
 	libparse	\
@@ -51,7 +48,7 @@ DIST_SUBDIRS=		\
 	util		\
 	$(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS=	-C --with-arlib --enable-local-libopts
+DISTCHECK_CONFIGURE_FLAGS = -C
 
 EXTRA_DIST =			\
 	COPYRIGHT		\

==== configure.ac ====
2010-02-03 23:51:51+00:00, davehart at shiny.ad.hartbrothers.com +7 -13
  Remove arlib, replace --with-arlib handling with deprecation warning.

--- 1.465.1.9/configure.ac	2009-12-28 04:17:38 -05:00
+++ 1.465.1.10/configure.ac	2010-02-03 18:51:51 -05:00
@@ -216,22 +216,16 @@ BINSUBDIR=$use_binsubdir
 AC_SUBST(BINSUBDIR)
 AM_CONDITIONAL(NTP_BINSUBDIR_IS_BIN, test "bin" = "$BINSUBDIR")
 
-AC_MSG_CHECKING([if we want to use arlib])
-AC_ARG_WITH(arlib,
-	AC_HELP_STRING([--with-arlib], [- Compile the async resolver library?]),
+AC_MSG_CHECKING([for deprecated --with-arlib])
+AC_ARG_WITH([arlib],
+	AC_HELP_STRING([--with-arlib], [- deprecated, arlib not distributed]),
 	[ans=$withval], [ans=no])
 AC_MSG_RESULT([$ans])
 
-if test -d $srcdir/arlib
-then
-    case "$ans" in
-     yes)
-	ARLIB_DIR=arlib
-	AC_CONFIG_SUBDIRS(arlib)
-	;;
-    esac
-fi
-AC_SUBST(ARLIB_DIR)
+case "$ans" in
+ yes)
+    AC_MSG_WARN([Please do not use --with-arlib, arlib is no longer included.  In the future, --with-arlib will not be recognized.])
+esac
 
 AC_ARG_WITH(rpath,
 	AC_HELP_STRING([--without-rpath], [s Disable auto-added -R linker paths]),


More information about the bk-ntp-dev-send mailing list