Changeset 253 for trunk/configure.acTweet

Timestamp:

Jan 21, 2011, 1:05:06 AM (12 years ago)

Author:

sam

Message:

Add preliminary support for sound samples. Implement click.

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -49 +49 @@
 
 # Use SDL?
-ac_cv_my_have_sdl="no"
+ac_cv_my_have_sdl="yes"
 save_CPPFLAGS="${CPPFLAGS}"
 AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
@@ -56 +56 @@
 fi
 AC_CHECK_HEADERS(SDL_image.h,
- [ac_cv_my_have_sdl="yes"],
- [ac_cv_my_have_sdl="no"])
+ [:],[ac_cv_my_have_sdl="no"])
+AC_CHECK_HEADERS(SDL_mixer.h,
+ [:],[ac_cv_my_have_sdl="no"])
 CPPFLAGS="${save_CPPFLAGS}"
 if test "${ac_cv_my_have_sdl}" != "no"; then
@@ -64 +65 @@
 AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
 
-if test "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no"; then
-  AC_MSG_ERROR([[cannot find SDL_Image or GTK+, please install one of them]])
+if test "${ac_cv_my_have_sdl}" = "no"; then
+  AC_MSG_ERROR([[One of SDL, SDL_Image or SDL_Mixer not found]])
 fi
 
@@ -89 +90 @@
 # How to use the Lol Engine inside this tree
 LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
-LOL_LIBS="`pkg-config --libs sdl gl SDL_image`"
+LOL_LIBS="`pkg-config --libs sdl gl SDL_image` -lSDL_mixer"
 
 if test "${enable_release}" = "yes"; then