From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 20 Dec 2009 02:47:40 +0000 (-0500)
Subject: [Bug 1415] Fix Mac OS X link problem
X-Git-Tag: NTP_4_2_6P1_RC1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c138aaedcc20ea79f1690261e51807bd54be02;p=thirdparty%2Fntp.git

[Bug 1415] Fix Mac OS X link problem

bk: 4b2d904cG5uqwvK5QY54PeokQK9FDQ
---

diff --git a/ChangeLog b/ChangeLog
index 38fbc343f..f86c272ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 * [Bug 1414] Enable "make distcheck" success with BSD make.
+* [Bug 1415] Fix Mac OS X link problem.
 * [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 * Build infrastructure updates to enable beta releases of ntp-stable.
 
diff --git a/configure.ac b/configure.ac
index 3ad2e85d5..53f3bd9b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,11 @@ esac
 
 AC_SEARCH_LIBS([setsockopt], [socket xnet])
 AC_SEARCH_LIBS([res_init], [resolv], , , [-lsocket -lnsl])
+case "$host" in
+ *-*-darwin*)
+    AC_CHECK_LIB([resolv],[res_9_init])
+    ;;
+esac
 AC_CHECK_FUNCS(res_init __res_init)
 
 AC_HEADER_STDC
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index ede645205..c1dfc684e 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -7,7 +7,7 @@ ntpsnmpd_SOURCES= netsnmp_daemonize.c ntpsnmpd.c ntpSnmpSubagentObject.c \
 			ntpsnmpd-opts.c ntpsnmpd-opts.h
 noinst_HEADERS=	ntpSnmpSubagentObject.h
 # HMS: we probably want a version.o file here, too.
-LDADD=		../ntpq/libntpq.a ../libntp/libntp.a @SNMP_LIBS@ 	\
+LDADD=		../ntpq/libntpq.a ../libntp/libntp.a @LCRYPTO@ @SNMP_LIBS@ \
 		$(LIBOPTS_LDADD)
 AM_CPPFLAGS= -I$(top_srcdir)/ntpq -I$(top_srcdir)/include \
 	-I$(top_srcdir)/lib/isc/include \