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

[Harlan Stenn]

#### ChangeSet ####
2008-09-16 05:40:31+00:00, stenn at ntp1.isc.org 
  [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

==== ChangeLog ====
2008-09-16 05:40:06+00:00, stenn at ntp1.isc.org +1 -0
  [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

--- 1.231/ChangeLog	2008-09-15 23:05:39 -04:00
+++ 1.232/ChangeLog	2008-09-16 01:40:06 -04:00
@@ -1,3 +1,4 @@
+* [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.
 * Clean up the libntpq.a build.
 * Regenerate ntp_parser.[ch] from ntp_parser.y
 (4.2.5p132) 2008/09/15 Released by Harlan Stenn <stenn at ntp.org>

==== configure.ac ====
2008-09-16 05:40:20+00:00, stenn at ntp1.isc.org +10 -1
  [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

--- 1.418/configure.ac	2008-09-13 04:58:24 -04:00
+++ 1.419/configure.ac	2008-09-16 01:40:20 -04:00
@@ -3839,7 +3839,16 @@ case "$ans" in
 	done
 	AC_SUBST(SNMP_CPPFLAGS)
 	AC_SUBST(SNMP_CFLAGS)
-	NTPSNMPD_DIR=ntpsnmpd
+
+	save_CFLAGS=$CFLAGS
+	save_CPPFLAGS=$CPPFLAGS
+	CFLAGS=$SNMP_CFLAGS
+	CPPFLAGS=$SNMP_CPPFLAGS
+	AC_CHECK_HEADER([net-snmp/net-snmp-config.h], [NTPSNMPD_DIR=ntpsnmpd],
+		[AC_MSG_WARN([net-snmp-config present but net-snmp headers are not available!])])
+	CFLAGS=$save_CFLAGS
+	CPPFLAGS=$save_CPPFLAGS
+
 	;;
      *) AC_MSG_WARN([Cannot build ntpsnmpd as desired - net-snmp-config cannot be found])
 	;;