From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 14 Apr 2012 03:49:28 +0000 (-0400)
Subject: Change the link order for ntpsntpd
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80ee96febcea66037ba41c49a0fe875fab9a98e3;p=thirdparty%2Fntp.git

Change the link order for ntpsntpd

bk: 4f88f3c8JvsYYDq5PGzkBT2ks5dkVQ
---

diff --git a/ChangeLog b/ChangeLog
index d6c880ad17..b863142d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Change the link order for ntpsntpd.
+* Remove extra 'nlist' check from configure.ac.
 (4.2.7p271) 2012/04/11 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1122] openssl detection via pkg-config fails when no additional
   -Idir flags are needed.
diff --git a/configure.ac b/configure.ac
index fec8e8a721..a51dbf9a0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,7 +804,7 @@ case "$host" in
  *) AC_CHECK_FUNCS([mlockall])
     ;;
 esac
-AC_CHECK_FUNCS([nice nlist plock pututline pututxline readlink recvmsg rtprio])
+AC_CHECK_FUNCS([nice plock pututline pututxline readlink recvmsg rtprio])
 case "$host" in
  *-*-aix[[456]]*)
     # Just a stub in AIX 4.  Idiots.
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index 0d9e5271cb..820b7ab958 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -9,8 +9,9 @@ ntpsnmpd_SOURCES= netsnmp_daemonize.c ntpsnmpd.c ntpSnmpSubagentObject.c \
 		ntpsnmpd-opts.c ntpsnmpd-opts.h ntpSnmpSubagentObject.h \
 		ntp_snmp.h
 # HMS: we probably want a version.o file here, too.
-LDADD  = ../ntpq/libntpq.a ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
-LDADD += $(PTHREAD_LIBS) $(LDADD_NTP) $(SNMP_LIBS) $(LIBOPTS_LDADD)
+LDADD  = ../ntpq/libntpq.a ../libntp/libntp.a
+LDADD += $(SNMP_LIBS) $(LDADD_LIBNTP) $(LIBM)
+LDADD += $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBOPTS_LDADD)
 
 AM_CFLAGS = $(SNMP_CFLAGS) $(CFLAGS_NTP)