Fix the configure.ac and Makefile.in to correctly test for --wrap

(cherry picked from commit 135519e59aff0e45fd9725feda0b9f5882f6121a)

diff --git a/configure b/configure
index 4709dee5acd4076b70aebf02e4a4a869ac8cbb9b..19a32ebe4f7d8e4e390bbda0524422dd61fc2743 100755 (executable)
--- a/configure
+++ b/configure
@@ -20325,27 +20325,97 @@ fi
 # Check for -Wl,--wrap= support
 #
 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="--wrap=printf"
 
+
+  CCASFLAGS_wrap_ax_save_flags=$CCASFLAGS
+
+
+
+  CFLAGS_wrap_ax_save_flags=$CFLAGS
+
+
+
+  CPPFLAGS_wrap_ax_save_flags=$CPPFLAGS
+
+
+
+  CXXFLAGS_wrap_ax_save_flags=$CXXFLAGS
+
+
+
+  ERLCFLAGS_wrap_ax_save_flags=$ERLCFLAGS
+
+
+
+  FCFLAGS_wrap_ax_save_flags=$FCFLAGS
+
+
+
+  FCLIBS_wrap_ax_save_flags=$FCLIBS
+
+
+
+  FFLAGS_wrap_ax_save_flags=$FFLAGS
+
+
+
+  FLIBS_wrap_ax_save_flags=$FLIBS
+
+
+
+  GCJFLAGS_wrap_ax_save_flags=$GCJFLAGS
+
+
+
+  JAVACFLAGS_wrap_ax_save_flags=$JAVACFLAGS
+
+
+
+  LDFLAGS_wrap_ax_save_flags=$LDFLAGS
+
+
+
+  LIBS_wrap_ax_save_flags=$LIBS
+
+
+
+  OBJCFLAGS_wrap_ax_save_flags=$OBJCFLAGS
+
+
+
+  OBJCXXFLAGS_wrap_ax_save_flags=$OBJCXXFLAGS
+
+
+
+  UPCFLAGS_wrap_ax_save_flags=$UPCFLAGS
+
+
+
+  VALAFLAGS_wrap_ax_save_flags=$VALAFLAGS
+
+
+
+
+LDFLAGS="-Wl,-wrap,exit"
 LD_WRAP_TESTS=false
-enable_ld_wrap=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker support for --wrap option" >&5
 $as_echo_n "checking for linker support for --wrap option... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <stdlib.h>
+                      void __real_exit (int status);
+                      void __wrap_exit (int status) { __real_exit (status); }
+
 int
 main ()
 {
-__wrap_printf("success"); return (0);
+exit (1);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  enable_ld_wrap=yes
-     LD_WRAP_TESTS=true
+  LD_WRAP_TESTS=true
 
 $as_echo "#define LD_WRAP 1" >>confdefs.h
 
@@ -20357,10 +20427,61 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-# AM_CONDITIONAL([LD_WRAP], [test $enable_ld_wrap = yes])
 
 
-LDFLAGS=$save_LDFLAGS
+
+  CCASFLAGS=$CCASFLAGS_wrap_ax_save_flags
+
+
+  CFLAGS=$CFLAGS_wrap_ax_save_flags
+
+
+  CPPFLAGS=$CPPFLAGS_wrap_ax_save_flags
+
+
+  CXXFLAGS=$CXXFLAGS_wrap_ax_save_flags
+
+
+  ERLCFLAGS=$ERLCFLAGS_wrap_ax_save_flags
+
+
+  FCFLAGS=$FCFLAGS_wrap_ax_save_flags
+
+
+  FCLIBS=$FCLIBS_wrap_ax_save_flags
+
+
+  FFLAGS=$FFLAGS_wrap_ax_save_flags
+
+
+  FLIBS=$FLIBS_wrap_ax_save_flags
+
+
+  GCJFLAGS=$GCJFLAGS_wrap_ax_save_flags
+
+
+  JAVACFLAGS=$JAVACFLAGS_wrap_ax_save_flags
+
+
+  LDFLAGS=$LDFLAGS_wrap_ax_save_flags
+
+
+  LIBS=$LIBS_wrap_ax_save_flags
+
+
+  OBJCFLAGS=$OBJCFLAGS_wrap_ax_save_flags
+
+
+  OBJCXXFLAGS=$OBJCXXFLAGS_wrap_ax_save_flags
+
+
+  UPCFLAGS=$UPCFLAGS_wrap_ax_save_flags
+
+
+  VALAFLAGS=$VALAFLAGS_wrap_ax_save_flags
+
+
+
 
 #
 # Check for i18n

diff --git a/configure.ac b/configure.ac
index e8d2827c7c821e9b147e535635e46dfe3ae782fd..1ac6e5f7420ebb6bdfbbba00a097f8a546188ffe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2441,23 +2441,24 @@ AC_SUBST([KYUA])
 # Check for -Wl,--wrap= support
 #
 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="--wrap=printf"
+AX_SAVE_FLAGS([wrap])
 
+LDFLAGS="-Wl,-wrap,exit"
 LD_WRAP_TESTS=false
-enable_ld_wrap=no
 AC_MSG_CHECKING([for linker support for --wrap option])
 AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([#include <stdio.h>], [__wrap_printf("success"); return (0);])],
-    [enable_ld_wrap=yes
-     LD_WRAP_TESTS=true
+    [AC_LANG_PROGRAM([[#include <stdlib.h>
+                      void __real_exit (int status);
+                      void __wrap_exit (int status) { __real_exit (status); }
+                     ]],
+                    [[exit (1);]])],
+    [LD_WRAP_TESTS=true
      AC_DEFINE([LD_WRAP], [1], [define if the linker supports --wrap option])
      AC_MSG_RESULT([yes])],
     [AC_MSG_RESULT([no])])
-# AM_CONDITIONAL([LD_WRAP], [test $enable_ld_wrap = yes])
 AC_SUBST([LD_WRAP_TESTS])
 
-LDFLAGS=$save_LDFLAGS
+AX_RESTORE_FLAGS([wrap])
 
 #
 # Check for i18n

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index eb297c96f8a9981a257ce4c77dc5475ff53e196f..2fab2554a5f867192ec4ab7b7933cccb80a3a676 100644 (file)
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -94,6 +94,8 @@ TARGETS =     acl_test@EXEEXT@ \
 
 @BIND9_MAKE_RULES@
 
+LD_WRAP_TESTS=@LD_WRAP_TESTS@
+
 acl_test@EXEEXT@: acl_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
                ${LDFLAGS} -o $@ acl_test.@O@ dnstest.@O@ ${DNSLIBS} \
@@ -234,9 +236,9 @@ time_test@EXEEXT@: time_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 
 WRAP = -Wl,--wrap=isc__mem_put,--wrap=isc__mem_get,--wrap=isc_mem_attach,--wrap=isc_mem_detach
 tkey_test@EXEEXT@: tkey_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       if test "${LD_WRAP}" = true; then wrap="${WRAP}"; fi; \
+       if test "${LD_WRAP_TESTS}" = true; then wrap="${WRAP}"; fi; \
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} \
-                       ${LDFLAGS} -o $@ tkey_test.@O@ \
+                       ${LDFLAGS} ${WRAP} -o $@ tkey_test.@O@ \
                        ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
 tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}