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

[Harlan Stenn]

#### ChangeSet ####
2008-09-16 21:05:36-04:00, stenn at whimsy.udel.edu 
  Clean up build process for ntpsnmpd.

==== ChangeLog ====
2008-09-16 21:00:57-04:00, stenn at whimsy.udel.edu +1 -0
  Clean up build process for ntpsnmpd.

--- 1.234/ChangeLog	2008-09-16 19:11:55 -04:00
+++ 1.235/ChangeLog	2008-09-16 21:00:57 -04:00
@@ -1,3 +1,4 @@
+* Clean up build process for ntpsnmpd.
 (4.2.5p133) 2008/09/16 Released by Harlan Stenn <stenn at ntp.org>
 * Add options processing to ntpsnmpd.
 * [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

==== Makefile.am ====
2008-09-16 21:03:27-04:00, stenn at whimsy.udel.edu +1 -1
  Clean up build process for ntpsnmpd.

--- 1.77/Makefile.am	2008-08-31 04:57:51 -04:00
+++ 1.78/Makefile.am	2008-09-16 21:03:27 -04:00
@@ -20,7 +20,7 @@ SUBDIRS+= 		\
 	ntpdate		\
 	ntpdc		\
 	ntpq		\
-	@NTPSNMPD_DIR@	\
+	ntpsnmpd	\
 	parseutil	\
 	adjtimed	\
 	clockstuff	\

==== configure.ac ====
2008-09-16 21:00:58-04:00, stenn at whimsy.udel.edu +2 -2
  Clean up build process for ntpsnmpd.

--- 1.419/configure.ac	2008-09-16 01:40:20 -04:00
+++ 1.420/configure.ac	2008-09-16 21:00:58 -04:00
@@ -3844,7 +3844,7 @@ case "$ans" in
 	save_CPPFLAGS=$CPPFLAGS
 	CFLAGS=$SNMP_CFLAGS
 	CPPFLAGS=$SNMP_CPPFLAGS
-	AC_CHECK_HEADER([net-snmp/net-snmp-config.h], [NTPSNMPD_DIR=ntpsnmpd],
+	AC_CHECK_HEADER([net-snmp/net-snmp-config.h], [MAKE_NTPSNMPD=ntpsnmpd],
 		[AC_MSG_WARN([net-snmp-config present but net-snmp headers are not available!])])
 	CFLAGS=$save_CFLAGS
 	CPPFLAGS=$save_CPPFLAGS
@@ -3855,7 +3855,7 @@ case "$ans" in
     esac
     ;;
 esac
-AC_SUBST(NTPSNMPD_DIR)
+AC_SUBST(MAKE_NTPSNMPD)
 
 AC_CACHE_CHECK(if we should always slew the time, ac_cv_var_slew_always,
 [AC_ARG_ENABLE(slew-always,

==== ntpsnmpd/Makefile.am ====
2008-09-16 21:01:00-04:00, stenn at whimsy.udel.edu +2 -1
  Clean up build process for ntpsnmpd.

--- 1.4/ntpsnmpd/Makefile.am	2008-09-16 03:30:35 -04:00
+++ 1.5/ntpsnmpd/Makefile.am	2008-09-16 21:01:00 -04:00
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS= 
 
-sbin_PROGRAMS=	ntpsnmpd
+sbin_PROGRAMS=	@MAKE_NTPSNMPD@
+EXTRA_PROGRAMS=	ntpsnmpd
 ntpsnmpd_SOURCES= ntpsnmpd.c ntpSnmpSubagentObject.c	\
 			ntpsnmpd-opts.c ntpsnmpd-opts.h
 noinst_HEADERS=	ntpSnmpSubagentObject.h