From 3b6a0b6baee3103d2abaafed543b445edce4c45e Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Wed, 7 Sep 2011 06:53:42 +0000 Subject: [PATCH] Ecore: Use pkg-config to check for SDL, not sdl-config (which fails for cross-compilations) SVN revision: 63249 --- legacy/ecore/configure.ac | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 2880161495..fbdfdc4357 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -523,25 +523,7 @@ fi # SDL library (ecore_sdl) have_sdl="no" -SDL_CONFIG="sdl-config" -AC_ARG_WITH([sdl-config], - [AC_HELP_STRING([--with-sdl-config=PATH], [use sdl-config specified])], - [ - SDL_CONFIG=$withval - AC_MSG_NOTICE([using ${SDL_CONFIG} for sdl-config]) - ]) - -AC_PATH_PROG([SDL_CONFIG], ["sdl-config"], [""], [$PATH]) - -if test -n "$SDL_CONFIG" ; then - SDL_CFLAGS=`$SDL_CONFIG --cflags` - SDL_LIBS=`$SDL_CONFIG --libs` - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - have_sdl="yes" -else - PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [have_sdl="yes"], [have_sdl="no"]) -fi +PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [have_sdl="yes"], [have_sdl="no"]) if test "x${have_sdl}" = "xyes" ; then PKG_CHECK_EXISTS([sdl >= 1.3.0],