From 2652e7e5204f89f319a0cf5f5ec4c57a3b4ce4fb Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 11 Dec 2001 09:38:52 +0000 Subject: [PATCH] this sdl test should work better, should've kept it in the first place ;) Original commit message from CVS: this sdl test should work better, should've kept it in the first place ;) --- configure.ac | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 36147d78ff..1d3d1f8f35 100644 --- a/configure.ac +++ b/configure.ac @@ -678,24 +678,7 @@ AC_CHECK_HEADER(dvdread/dvd_reader.h, :, HAVE_LIBDVDREAD=no) dnl Check for SDL library dnl this bit is taken from vlc's configure.in and modified accordingly -SDL_PATH=$PATH -AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH) -SDL_CONFIG=${SDL_CONFIG} -if test "x${SDL_CONFIG}" = "xno" -then - AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, $SDL_PATH) - SDL_CONFIG=${SDL11_CONFIG} -fi -if test "x${SDL_CONFIG}" = "xno" -then - AC_PATH_PROG(SDL12_CONFIG, sdl11-config, no, $SDL_PATH) - SDL_CONFIG=${SDL12_CONFIG} -fi - -if test "x${SDL_CONFIG}" = "xyes" -then - AM_PATH_SDL( , , HAVE_LIBSDL=no) -fi +AM_PATH_SDL(1.1.0, HAVE_LIBSDL=yes, HAVE_LIBSDL=no) if test "x$HAVE_LIBSDL" = "xno"; then AC_MSG_WARN( @@ -703,7 +686,6 @@ if test "x$HAVE_LIBSDL" = "xno"; then ) fi - dnl Check for linux/cdrom.h AC_CHECK_HEADER(linux/cdrom.h, HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no