From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 17 Sep 2008 01:05:36 +0000 (-0400)
Subject: Clean up build process for ntpsnmpd.
X-Git-Tag: NTP_4_2_5P134~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e9453a9cd88de838bd8a800940a38a59b442d8;p=thirdparty%2Fntp.git

Clean up build process for ntpsnmpd.

bk: 48d057e0ni9VozzTyUCogk1C8JhiLw
---

diff --git a/ChangeLog b/ChangeLog
index 144f2fe09..6bccab293 100644
--- 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 ee58f0e4e..0a7c9237c 100644
--- 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 222e696b8..d92f1dc0b 100644
--- 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 d3681e093..0279bce66 100644
--- 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