J. Snell fixed bug #482 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Sat, 29 Dec 2007 20:08:51 +0000
branchSDL-1.2
changeset 4121917ca146d901
parent 4120 d07c60f5e460
child 4122 cb7b118b400a
J. Snell fixed bug #482

Fixed arguments used with sdl-config in sdl.m4
docs.html
sdl.m4
     1.1 --- a/docs.html	Sat Dec 29 19:44:02 2007 +0000
     1.2 +++ b/docs.html	Sat Dec 29 20:08:51 2007 +0000
     1.3 @@ -45,6 +45,9 @@
     1.4  <P>
     1.5  	Scan for all joysticks on Linux instead of stopping at one that was removed.
     1.6  </P>
     1.7 +<P>
     1.8 +	Fixed use of sdl-config arguments in sdl.m4
     1.9 +</P>
    1.10  </BLOCKQUOTE>
    1.11  
    1.12  <H3> Windows Notes </H3>
     2.1 --- a/sdl.m4	Sat Dec 29 19:44:02 2007 +0000
     2.2 +++ b/sdl.m4	Sat Dec 29 20:08:51 2007 +0000
     2.3 @@ -20,13 +20,13 @@
     2.4  		    , enable_sdltest=yes)
     2.5  
     2.6    if test x$sdl_exec_prefix != x ; then
     2.7 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
     2.8 +    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
     2.9      if test x${SDL_CONFIG+set} != xset ; then
    2.10        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    2.11      fi
    2.12    fi
    2.13    if test x$sdl_prefix != x ; then
    2.14 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
    2.15 +    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    2.16      if test x${SDL_CONFIG+set} != xset ; then
    2.17        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    2.18      fi
    2.19 @@ -42,12 +42,12 @@
    2.20    if test "$SDL_CONFIG" = "no" ; then
    2.21      no_sdl=yes
    2.22    else
    2.23 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
    2.24 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
    2.25 +    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    2.26 +    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    2.27  
    2.28 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
    2.29 +    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.30             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    2.31 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
    2.32 +    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.33             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    2.34      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.35             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`