Clean up build process for ntpsnmpd.

bk: 48d057e0ni9VozzTyUCogk1C8JhiLw

diff --git a/ChangeLog b/ChangeLog
index 144f2fe0977a71761c261039dd8a6bc915d98898..6bccab2938e3c2f122f41eaa25a60fea08f91d10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Clean up build process for ntpsnmpd.
 (4.2.5p133) 2008/09/16 Released by Harlan Stenn <stenn@ntp.org>
 * Add options processing to ntpsnmpd.
 * [Bug 1062] Check net-snmp headers before deciding to build ntpsnmpd.

diff --git a/Makefile.am b/Makefile.am
index ee58f0e4e26028039f7eb01fa9038793ff069dc3..0a7c9237cd53a2f57f3018254c80e216c60ad86c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS+=             \
        ntpdate         \
        ntpdc           \
        ntpq            \
-       @NTPSNMPD_DIR@  \
+       ntpsnmpd        \
        parseutil       \
        adjtimed        \
        clockstuff      \

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

diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index d3681e093d9008333498907e9b7234e297b58e7d..0279bce666619887b222be30205efafa7ebc5264 100644 (file)
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -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