From 5e3f20a71bbfd3058b4a6f5a008a98aea8167e23 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 12 Nov 2018 17:57:31 +1100 Subject: [PATCH] remove duplicate block --- configure | 41 ----------------------------------------- configure.ac | 22 ---------------------- 2 files changed, 63 deletions(-) diff --git a/configure b/configure index e666ddfcc2..5512f69c65 100755 --- a/configure +++ b/configure @@ -19911,47 +19911,6 @@ rm -f core conftest.err conftest.$ac_objext \ # AM_CONDITIONAL([LD_WRAP], [test $enable_ld_wrap = yes]) -LDFLAGS=$save_LDFLAGS - -# -# Check for -Wl,--wrap= support -# - -save_LDFLAGS=$LDFLAGS -LDFLAGS="--wrap=printf" - -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 -int -main () -{ -__wrap_printf("success"); return (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - enable_ld_wrap=yes - LD_WRAP_TESTS=true - -$as_echo "#define LD_WRAP 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$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 # diff --git a/configure.ac b/configure.ac index fc48c7418e..4206ae0c7b 100644 --- a/configure.ac +++ b/configure.ac @@ -2453,28 +2453,6 @@ AC_SUBST([LD_WRAP_TESTS]) LDFLAGS=$save_LDFLAGS -# -# Check for -Wl,--wrap= support -# - -save_LDFLAGS=$LDFLAGS -LDFLAGS="--wrap=printf" - -LD_WRAP_TESTS=false -enable_ld_wrap=no -AC_MSG_CHECKING([for linker support for --wrap option]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], [__wrap_printf("success"); return (0);])], - [enable_ld_wrap=yes - 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 - # # Check whether to build Automated Test Framework unit tests #