configure.in
changeset 1648 9f59d4c5aaea
parent 1640 5eaab017cc28
child 1654 0a53c90a37f9
child 1742 af4352da64d8
--- a/configure.in	Thu Apr 20 16:33:51 2006 +0000
+++ b/configure.in	Sat Apr 22 19:17:14 2006 +0000
@@ -65,7 +65,7 @@
         BASE_LDFLAGS=""
         ;;
 esac
-BUILD_CFLAGS="$CFLAGS"
+BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
 BUILD_LDFLAGS="$LDFLAGS"
 EXTRA_LDFLAGS="$BASE_LDFLAGS"
@@ -2336,6 +2336,15 @@
         CheckDiskAudio
         CheckDummyAudio
         CheckDLOPEN
+
+        # Set up files for the shared object loading library
+        # (this needs to be done before the dynamic X11 check)
+        if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
+            AC_DEFINE(SDL_LOADSO_DLCOMPAT)
+            SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
+            have_loadso=yes
+        fi
+
         CheckCOCOA
         CheckCARBON
         CheckX11
@@ -2374,12 +2383,6 @@
             SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
             have_timers=yes
         fi
-        # Set up files for the shared object loading library
-        if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
-            AC_DEFINE(SDL_LOADSO_DLCOMPAT)
-            SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
-            have_loadso=yes
-        fi
         # The Mac OS X platform requires special setup.
         SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"