specify the install name when building libwrap

diff --git a/configure b/configure
index 5d9bd43cc904c49da016943da2bfd161a9cd8cd9..86fc3270ee2d360df5ad44d3205bcaf1e652fa80 100755 (executable)
--- a/configure
+++ b/configure
@@ -669,6 +669,7 @@ BIND9_ISCCFG_BUILDINCLUDE
 BIND9_ISCCC_BUILDINCLUDE
 BIND9_ISC_BUILDINCLUDE
 BIND9_TOP_BUILDDIR
+WRAP_NAME
 WRAP_INTERPOSE
 LD_WRAP_TESTS
 KYUA
@@ -21954,6 +21955,15 @@ rm -f core conftest.err conftest.$ac_objext \
 
 
 
+WRAP_NAME=''
+case $host in #(
+  *-darwin*) :
+    WRAP_NAME='${WRAP_NAME}' ;; #(
+  *) :
+     ;;
+esac
+
+
 #
 # Check for i18n
 #

diff --git a/configure.ac b/configure.ac
index d4751d134f1091a415724dda5714d21bc6db474a..7132612ac44a2fca75e89a4c075f6e0b1929da83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2204,6 +2204,10 @@ AX_RESTORE_FLAGS([interpose])
 
 AC_SUBST([WRAP_INTERPOSE])
 
+WRAP_NAME=''
+AS_CASE([$host],[*-darwin*],[WRAP_NAME='${WRAP_NAME}'])
+AC_SUBST([WRAP_NAME])
+
 #
 # Check for i18n
 #

diff --git a/lib/ns/tests/Makefile.in b/lib/ns/tests/Makefile.in
index ccc1ec35dddffb99c54cb88c56984ad665465e95..5fb2c1e394159f48dcdfcb77942a6fc5ddb3c9ba 100644 (file)
--- a/lib/ns/tests/Makefile.in
+++ b/lib/ns/tests/Makefile.in
@@ -17,6 +17,7 @@ VERSION=@BIND9_VERSION@
 
 WRAP_INTERPOSE=        @WRAP_INTERPOSE@
 WRAP_OPTIONS = -Wl,--wrap=isc_nmhandle_unref
+WRAP_NAME =    -Wl,-install_name,${top_builddir}/lib/ns/tests/$@
 WRAP_RPATH =   -Wl,-rpath,${top_builddir}/lib/ns/tests
 WRAP_LIB =     -L${top_builddir}/lib/ns/tests -lwrap
 
@@ -60,7 +61,7 @@ LD_WRAP_TESTS=@LD_WRAP_TESTS@
 @BIND9_MAKE_RULES@
 
 libwrap.@SO@: wrap.@O@
-       ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} ${WRAP_INTERPOSE} -o $@ wrap.@O@ ${LIBS}
+       ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} ${WRAP_INTERPOSE} @WRAP_NAME@ -o $@ wrap.@O@ ${LIBS}
 
 listenlist_test@EXEEXT@: listenlist_test.@O@ nstest.@O@ libwrap.@SO@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS}
        if test "${LD_WRAP_TESTS}" = true -a -z "${LIBTOOL}"; then WRAP="${WRAP_OPTIONS}"; fi; \