From 6fbbe09a2a09134c9933b741b830910421bc3f77 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 12 Mar 2011 13:28:56 -0800
Subject: [PATCH] If we leave the default SDL_config.h in place, it'll override
 the one generated by configure when building from a different directory. 
 Argh...

---
 configure    | 6 +++++-
 configure.in | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 2bdb64092..4e6c3432c 100755
--- a/configure
+++ b/configure
@@ -15474,7 +15474,11 @@ done
 
 INCLUDE="-I$srcdir/include"
 if test x$srcdir != x.; then
-    # We want to include the generated SDL_config.h first
+    # Remove SDL_config.h from the source directory, since it's the
+    # default one, and we want to include the one that we generate.
+    if test -f $srcdir/include/SDL_config.h; then
+        rm $srcdir/include/SDL_config.h
+    fi
     INCLUDE="-Iinclude $INCLUDE"
 fi
 case "$host" in
diff --git a/configure.in b/configure.in
index 494a18126..4fddcd30f 100644
--- a/configure.in
+++ b/configure.in
@@ -65,7 +65,11 @@ AC_CHECK_PROGS(WINDRES, [windres $hostaliaswindres $host_os-windres])
 dnl Set up the compiler and linker flags
 INCLUDE="-I$srcdir/include"
 if test x$srcdir != x.; then
-    # We want to include the generated SDL_config.h first
+    # Remove SDL_config.h from the source directory, since it's the
+    # default one, and we want to include the one that we generate.
+    if test -f $srcdir/include/SDL_config.h; then
+        rm $srcdir/include/SDL_config.h
+    fi
     INCLUDE="-Iinclude $INCLUDE"
 fi
 case "$host" in