Changeset 949 for trunk/configure.acTweet

Timestamp:

Sep 13, 2011, 6:09:44 PM (8 years ago)

Author:

sam

Message:

build: move SDL_image and SDL_mixer binaries to an i686-only directory.

File:

• trunk/configure.ac (modified) (1 diff)

trunk/configure.ac

@@ -174 +174 @@
 dnl Use SDL? (always required on Linux or Win32)
 ac_cv_my_have_sdl="no"
-if test "x$cross_compiling" != xyes; then
-  ac_cv_my_have_sdl="yes"
+ac_cv_my_have_sdl_image="no"
+ac_cv_my_have_sdl_mixer="no"
+dnl
+dnl  First, try the proper pkg-config check
+PKG_CHECK_MODULES(SDL, sdl, [ac_cv_my_have_sdl="yes"], [:])
+PKG_CHECK_MODULES(SDLMIXER, SDL_mixer, [ac_cv_my_have_sdl_mixer="yes"], [:])
+PKG_CHECK_MODULES(SDLIMAGE, SDL_image, [ac_cv_my_have_sdl_image="yes"], [:])
+dnl
+dnl  Then the old sdl-config method
+if test "x${cross_compiling}" != xyes -a "${ac_cv_my_have_sdl}" != yes; then
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-  if test "${SDL_CONFIG}" != "no" -a "x$cross_compiling" != xyes; then
-    SDL_CFLAGS="${SDL_CFLAGS} `sdl-config --cflags`"
-    SDL_LIBS="${SDL_LIBS} `sdl-config --libs`"
+  if test "${SDL_CONFIG}" != "no"; then
+    SDL_CFLAGS="${SDL_CFLAGS} `${SDL_CONFIG} --cflags`"
+    SDL_LIBS="${SDL_LIBS} `${SDL_CONFIG} --libs`"
+    ac_cv_my_have_sdl="yes"
   fi
-  PKG_CHECK_MODULES(SDL, sdl, [:],
-   [SDL_LIBS="${SDL_LIBS} -lSDL"])
-  PKG_CHECK_MODULES(SDLMIXER, SDL_mixer, [:],
-   [SDLMIXER_LIBS="${SDLMIXER_LIBS} -lSDL_mixer"])
-  PKG_CHECK_MODULES(SDLIMAGE, SDL_image, [:],
-   [SDLIMAGE_LIBS="${SDLIMAGE_LIBS} -lSDL_image"])
-  SDL_CFLAGS="${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
-  SDL_LIBS="${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
-  save_CPPFLAGS="${CPPFLAGS}"
-  CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
-  AC_CHECK_HEADERS(SDL_mixer.h, [:], [ac_cv_my_have_sdl="no"])
-  AC_CHECK_HEADERS(SDL_image.h, [:], [ac_cv_my_have_sdl="no"])
-  CPPFLAGS="${save_CPPFLAGS}"
-  if test "${ac_cv_my_have_sdl}" = "no"; then
-    AC_MSG_WARN([[One of SDL, SDL_Image or SDL_Mixer not found]])
-  else
-    AC_DEFINE(USE_SDL, 1, Define to 1 to use SDL)
-  fi
+fi
+dnl
+dnl  Maybe all this has failed, try direct inclusion
+save_CPPFLAGS="${CPPFLAGS}"
+save_LIBS="${LIBS}"
+CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
+LIBS="${LIBS} ${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
+AC_CHECK_HEADERS(SDL.h SDL/SDL.h, [ac_cv_my_have_sdl="yes"])
+AC_CHECK_HEADERS(SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
+AC_CHECK_HEADERS(SDL_image.h, [ac_cv_my_have_sdl_image="yes"])
+AC_CHECK_LIB(SDL, main,
+ [SDL_LIBS="${SDL_LIBS} -lSDL"],
+ [ac_cv_my_have_sdl="no"])
+AC_CHECK_LIB(SDL_mixer, main,
+ [SDLMIXER_LIBS="${SDLMIXER_LIBS} -lSDL_mixer"],
+ [ac_cv_my_have_sdl_mixer="no"])
+AC_CHECK_LIB(SDL_image, main,
+ [SDLIMAGE_LIBS="${SDLIMAGE_LIBS} -lSDL_image"],
+ [ac_cv_my_have_sdl_image="no"])
+SDL_CFLAGS="${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
+SDL_LIBS="${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
+CPPFLAGS="${save_CPPFLAGS}"
+LIBS="${save_LIBS}"
+if test "${ac_cv_my_have_sdl}" = "no"; then
+  AC_MSG_WARN([SDL not found])
+else
+  AC_DEFINE(USE_SDL, 1, Define to 1 to use SDL)
+fi
+if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
+  AC_MSG_WARN([SDL_mixer not found])
+fi
+if test "${ac_cv_my_have_sdl_image}" = "no"; then
+  AC_MSG_WARN([SDL_image not found])
 fi
 AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
+AM_CONDITIONAL(USE_SDL_MIXER, test "${ac_cv_my_have_sdl_mixer}" = "yes")
+AM_CONDITIONAL(USE_SDL_IMAGE, test "${ac_cv_my_have_sdl_image}" = "yes")