[Bug 1415] Fix Mac OS X link problem

bk: 4b2d904cG5uqwvK5QY54PeokQK9FDQ

diff --git a/ChangeLog b/ChangeLog
index 38fbc343f9c7b548507f7ac2983f52fe2b231e45..f86c272ee1dd87de3999b9939c845c4628af1951 100644 (file)
--- 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 3ad2e85d5e79d0cc1556b87db4a6ddd26b3c5922..53f3bd9b2f1bc3c6781841b827839f596810e720 100644 (file)
--- 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 ede645205bee7022db23d85f870e249ad3eb0eaf..c1dfc684ea6fd1420135ed276832b53d15abef9b 100644 (file)
--- 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 \