Mercurial > sdl-ios-xcode
changeset 4121:917ca146d901 SDL-1.2
J. Snell fixed bug #482
Fixed arguments used with sdl-config in sdl.m4
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 29 Dec 2007 20:08:51 +0000 |
| parents | d07c60f5e460 |
| children | cb7b118b400a |
| files | docs.html sdl.m4 |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/docs.html Sat Dec 29 19:44:02 2007 +0000 +++ b/docs.html Sat Dec 29 20:08:51 2007 +0000 @@ -45,6 +45,9 @@ <P> Scan for all joysticks on Linux instead of stopping at one that was removed. </P> +<P> + Fixed use of sdl-config arguments in sdl.m4 +</P> </BLOCKQUOTE> <H3> Windows Notes </H3>
--- a/sdl.m4 Sat Dec 29 19:44:02 2007 +0000 +++ b/sdl.m4 Sat Dec 29 20:08:51 2007 +0000 @@ -20,13 +20,13 @@ , enable_sdltest=yes) if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" if test x${SDL_CONFIG+set} != xset ; then SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config fi fi if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" if test x${SDL_CONFIG+set} != xset ; then SDL_CONFIG=$sdl_prefix/bin/sdl-config fi @@ -42,12 +42,12 @@ if test "$SDL_CONFIG" = "no" ; then no_sdl=yes else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` + SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ + sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`