From a63b842e24128829c25c2a0e527d71e3721be1e6 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sat, 30 Oct 2004 23:47:00 +0000
Subject: [PATCH] CFLAGS fix backported from devbranch.

---
 CHANGELOG    | 1 +
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0a885434..a11b6da4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 
 10302004 - Fixed a strcpy that should have been a strcat. (thanks, Tolga!)
            Removed .cvsignore files (we're in a Subversion repository, now).
+           Build system respects external CFLAGS now. (thanks, Adam!)
 09212003 - Happy September. Fixes to bootstrap on MacOS X. Seeking now tries
            to respect pre-buffered data.
 
diff --git a/configure.in b/configure.in
index 145e16ba..4e090503 100644
--- a/configure.in
+++ b/configure.in
@@ -493,7 +493,7 @@ AC_CHECK_FUNCS([memset strrchr])
 
 AC_CHECK_SIZEOF(int, 4)
 
-CFLAGS="$CFLAGS $PHYSFSCFLAGS -D_REENTRANT -D_THREAD_SAFE"
+CFLAGS="$PHYSFSCFLAGS $CFLAGS -D_REENTRANT -D_THREAD_SAFE"
 LDFLAGS="$LDFLAGS $PHYSFSLDFLAGS -no-undefined"
 
 dnl Add Makefile conditionals