From 73006b32c756fa7ea6da6351dc0acbe3e015c05b Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 14 Dec 2006 23:37:05 +0000
Subject: [PATCH] Take $CFLAGS and $LDFLAGS into account for dependency
 detection (they were already used for the building itself).

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2597 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                   |  2 ++
 sc2/build/unix/config_functions | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 3879208b3..1401932b0 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.6:
+- Take $CFLAGS and $LDFLAGS into account for dependency detection
+  (they were already used for the building itself) - SvdB
 - Validate UQM version of either side of a Netplay game - SvdB
 - Better abort and disconnect handling for Netplay - SvdB
 - Menu sounds in Setup track rest of game (#922), from Nic - Michael
diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions
index d53b074d2..df4b78089 100644
--- a/sc2/build/unix/config_functions
+++ b/sc2/build/unix/config_functions
@@ -492,7 +492,7 @@ have_library() {
 		TEMP_CFLAGS=`evalVar LIB_${LIB}_CFLAGS`
 		TEMP_LDFLAGS=`evalVar LIB_${LIB}_LDFLAGS`
 
-		try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF
+		try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF
 int main(int argc, char *argv[]) {
 	(void) argc;  /* Get rid of unused variable warning */
 	(void) argv;  /* Get rid of unused variable warning */
@@ -575,7 +575,7 @@ have_symbol_generic() {
 		CODE=$2
 	fi
 
-	try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1
+	try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
 #include <sys/types.h>
 $EXTRA
 
@@ -677,7 +677,7 @@ have_header() {
 	NAME=${HEADER%.h}
 	EXTRA=`evalVar HEADER_${NAME}_EXTRA`
 
-	try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1
+	try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
 $EXTRA
 #include <$HEADER>
 int main() {
@@ -719,7 +719,7 @@ have_macro() {
 
 	EXTRA=`evalVar MACRO_${NAME}_EXTRA`
 
-	try_compile_c "$TEMP_CFLAGS" "$TEMP_LDFLAGS" << EOF > /dev/null 2>&1
+	try_compile_c "$CFLAGS $TEMP_CFLAGS" "$LDFLAGS $TEMP_LDFLAGS" << EOF > /dev/null 2>&1
 $EXTRA
 #ifndef $MACRO
 #	error
@@ -791,7 +791,7 @@ check_endianness() {
 		esac
 	else
 		# Detect endianness
-		try_compile_and_run_c << EOF
+		try_compile_and_run_c "$CFLAGS" "$LDFLAGS" << EOF
 int main() {
 	int i;