sdl.m4
changeset 2288 e9bcf004c324
parent 1755 91063c450171
child 2301 ebcebb426771
     1.1 --- a/sdl.m4	Sat Dec 29 19:45:09 2007 +0000
     1.2 +++ b/sdl.m4	Sat Dec 29 20:13:23 2007 +0000
     1.3 @@ -20,13 +20,13 @@
     1.4  		    , enable_sdltest=yes)
     1.5  
     1.6    if test x$sdl_exec_prefix != x ; then
     1.7 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
     1.8 +    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
     1.9      if test x${SDL_CONFIG+set} != xset ; then
    1.10        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    1.11      fi
    1.12    fi
    1.13    if test x$sdl_prefix != x ; then
    1.14 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
    1.15 +    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    1.16      if test x${SDL_CONFIG+set} != xset ; then
    1.17        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    1.18      fi
    1.19 @@ -42,12 +42,12 @@
    1.20    if test "$SDL_CONFIG" = "no" ; then
    1.21      no_sdl=yes
    1.22    else
    1.23 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
    1.24 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
    1.25 +    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    1.26 +    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    1.27  
    1.28 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
    1.29 +    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
    1.30             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    1.31 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
    1.32 +    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
    1.33             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    1.34      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    1.35             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`