pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

J. Snell fixed bug #482

Browse source 
Fixed arguments used with sdl-config in sdl.m4

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402680
This commit is contained in:
Sam Lantinga 2007-12-29 20:08:51 +00:00
parent b8dac67496
commit 61b0ff7d8e
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs.html
View file

@ -45,6 +45,9 @@ SDL 1.2.13 is a minor bug fix release.
<P> <P>
Scan for all joysticks on Linux instead of stopping at one that was removed. Scan for all joysticks on Linux instead of stopping at one that was removed.
</P> </P>
<P>
Fixed use of sdl-config arguments in sdl.m4
</P>
</BLOCKQUOTE> </BLOCKQUOTE>
<H3> Windows Notes </H3> <H3> Windows Notes </H3>

12
sdl.m4
View file

@ -20,13 +20,13 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
, enable_sdltest=yes) , enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then 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 if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi fi
fi fi
if test x$sdl_prefix != x ; then 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 if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi fi
@ -42,12 +42,12 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
if test "$SDL_CONFIG" = "no" ; then if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes no_sdl=yes
else else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` 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/'` 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/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`