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...
libsdl-org · Mar 12, 2011 · 6fbbe09 · 6fbbe09
1 parent 9ccb93c
commit 6fbbe09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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