diff options
| author | davilla <davilla@xbmc.org> | 2011-09-05 13:32:31 -0400 |
|---|---|---|
| committer | davilla <davilla@xbmc.org> | 2011-09-05 13:32:50 -0400 |
| commit | e0db84e5e102c85ca19dd08a6ecbc028095f1cd9 (patch) | |
| tree | 694ea1e78ae9e7266e65cda6eb2aa0d585907e15 /configure.in | |
| parent | 7f82ae1d45e51961bcd4c2eac3e6fbcebf8576b2 (diff) | |
changed, move SDL lib checks to an enable/disable-sdl configure param, default is auto
Diffstat (limited to 'configure.in')
| -rwxr-xr-x[-rw-r--r--] | configure.in | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 293c9e8557..01e88e1220 100644..100755 --- a/configure.in +++ b/configure.in @@ -158,6 +158,12 @@ AC_ARG_ENABLE([gles], [use_gles=$enableval], [use_gles=no]) +AC_ARG_ENABLE([sdl], + [AS_HELP_STRING([--enable-sdl], + [enable SDL (default is auto)])], + [use_sdl=$enableval], + [use_sdl=auto]) + AC_ARG_ENABLE([vdpau], [AS_HELP_STRING([--enable-vdpau], [enable VDPAU decoding (default is auto)])], @@ -715,12 +721,10 @@ if test "$host_vendor" = "apple" ; then AC_CHECK_LIB([SDL], [main],, AC_MSG_ERROR($missing_library)) fi else - AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library)) PKG_CHECK_MODULES([ALSA], [alsa], [INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"; use_alsa=yes], @@ -729,9 +733,14 @@ else [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"; use_dbus=yes]; \ AC_DEFINE([HAVE_DBUS],[1],["Define to 1 if dbus is installed"]), AC_MSG_NOTICE($missing_library); use_dbus=no) - PKG_CHECK_MODULES([SDL], [sdl], - [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"], - AC_MSG_ERROR($missing_library)) + + if test "x$use_sdl" != "xno"; then + PKG_CHECK_MODULES([SDL], [sdl], + [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"], + AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library)) + fi fi XB_FIND_SONAME([MAD], [mad]) |