From: Mark Andrews <marka@isc.org>
Date: Tue, 11 Feb 2014 22:07:54 +0000 (+1100)
Subject: define and use BACKTRACECFLAGS
X-Git-Tag: v9.10.0b1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b66ee9147e940572a0e873ecbd67456ccb85c39;p=thirdparty%2Fbind9.git

define and use BACKTRACECFLAGS
---

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 912e91f1d97..3609adf64fc 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -26,6 +26,7 @@ CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
 
 CDEFINES =
 CWARNINGS =
+BACKTRACECFLAGS = @BACKTRACECFLAGS@
 
 DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =	../../lib/isc/libisc.@A@ @DNS_CRYPTO_LIBS@
@@ -138,8 +139,8 @@ XSRCS =		adb_test.c \
 @BIND9_MAKE_RULES@
 
 # disable optimization for backtrace test to get the expected result	
-BTTEST_CFLAGS =	${EXT_CFLAGS} ${ALL_CPPFLAGS} -g ${ALWAYS_WARNINGS} \
-	${STD_CWARNINGS} ${CWARNINGS}
+BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
+		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
 
 all_tests: ${XTARGETS}
 
diff --git a/configure b/configure
index 18ddc8f140a..b41c556d265 100755
--- a/configure
+++ b/configure
@@ -851,6 +851,7 @@ PERL
 ETAGS
 LN
 ARFLAGS
+BACKTRACECFLAGS
 CCNOOPT
 CCOPT
 STD_CWARNINGS
@@ -11344,6 +11345,7 @@ fi
 
 
 
+
 # Warn if the user specified libbind, which is now deprecated
 # Check whether --enable-libbind was given.
 if test "${enable_libbind+set}" = set; then :
@@ -16138,7 +16140,8 @@ $as_echo "no" >&6; }
 	fi
 	case "$host" in
 	*-hp-hpux*)
-		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
+		CFLAGS="$CFLAGS -Wl,+vnocompatwarnings"
+		BACKTRACECFLAGS="$BACKTRACECFLAGS -Wl,+vnocompatwarnings"
 		;;
 	esac
 else
@@ -16166,7 +16169,8 @@ else
 		esac
 		CCOPT="$CCOPT -Ae -z"
 		CCNOOPT="$CCNOOPT -Ae -z"
-		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
+		CFLAGS="$CFLAGS -Wl,+vnocompatwarnings"
+		BACKTRACECFLAGS="$BACKTRACECFLAGS -Wl,+vnocompatwarnings"
 		MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 		;;
 	*-sgi-irix*)
diff --git a/configure.in b/configure.in
index 20cca2f1e16..77819529ee6 100644
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,7 @@ AC_SUBST(STD_CDEFINES)
 AC_SUBST(STD_CWARNINGS)
 AC_SUBST(CCOPT)
 AC_SUBST(CCNOOPT)
+AC_SUBST(BACKTRACECFLAGS)
 
 # Warn if the user specified libbind, which is now deprecated
 AC_ARG_ENABLE(libbind, [  --enable-libbind	  deprecated])
@@ -1816,7 +1817,8 @@ if test "X$GCC" = "Xyes"; then
 	fi
 	case "$host" in
 	*-hp-hpux*)
-		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
+		CFLAGS="$CFLAGS -Wl,+vnocompatwarnings"
+		BACKTRACECFLAGS="$BACKTRACECFLAGS -Wl,+vnocompatwarnings"
 		;;
 	esac
 else
@@ -1844,7 +1846,8 @@ else
 		esac
 		CCOPT="$CCOPT -Ae -z"
 		CCNOOPT="$CCNOOPT -Ae -z"
-		STD_CWARNINGS="$STD_CWARNINGS -Wl,+vnocompatwarnings"
+		CFLAGS="$CFLAGS -Wl,+vnocompatwarnings"
+		BACKTRACECFLAGS="$BACKTRACECFLAGS -Wl,+vnocompatwarnings"
 		MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 		;;
 	*-sgi-irix*)