aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-10-31 15:58:57 +0000
committerMåns Rullgård <mans@mansr.com>2009-10-31 15:58:57 +0000
commitb4f93564336a0eeefb857d806251cf3e67087328 (patch)
tree517be38838a323459cd75d7a79a7b68094794936 /configure
parentc73f65d979c41282ac52c5346f73489d12ce6a5a (diff)
downloadffmpeg-b4f93564336a0eeefb857d806251cf3e67087328.tar.gz
configure: simplify setting of SDL flags in config.mak
Originally committed as revision 20425 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index 4bba6bd452..a09bdba28d 100755
--- a/configure
+++ b/configure
@@ -2356,8 +2356,9 @@ disable sdl
SDL_CONFIG="${cross_prefix}sdl-config"
if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
sdl_cflags=$("${SDL_CONFIG}" --cflags)
+ sdl_libs=$("${SDL_CONFIG}" --libs)
temp_cflags $sdl_cflags
- temp_extralibs $("${SDL_CONFIG}" --libs)
+ temp_extralibs $sdl_libs
if check_lib2 SDL.h SDL_Init; then
_sdlversion=$("${SDL_CONFIG}" --version | sed 's/[^0-9]//g')
if test "$_sdlversion" -lt 121 ; then
@@ -2707,11 +2708,8 @@ echo "HOSTLDFLAGS=$host_ldflags" >> config.mak
echo "HOSTLIBS=$host_libs" >> config.mak
echo "TARGET_EXEC=$target_exec" >> config.mak
echo "TARGET_PATH=$target_path" >> config.mak
-
-if enabled sdl; then
- echo "SDL_LIBS=$("${SDL_CONFIG}" --libs)" >> config.mak
- echo "SDL_CFLAGS=$("${SDL_CONFIG}" --cflags)" >> config.mak
-fi
+echo "SDL_LIBS=$sdl_libs" >> config.mak
+echo "SDL_CFLAGS=$sdl_cflags" >> config.mak
get_version(){
name=$1