[Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

bk: 48cf46cf0lyFKBMgPrpyIrgnQp3Plw

diff --git a/ChangeLog b/ChangeLog
index 0a4296aee124d8c67ab194c4910a725cade4f5a6..736b904d51b2a759beb7741acc84caa0597e9299 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@ntp.org>

diff --git a/configure.ac b/configure.ac
index 2a001b42cc3db9fdcd4345547671c6a58535ebb1..222e696b88e49decb9b0a98d678a5fab08928c27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])
        ;;