Mercurial > sdl-ios-xcode

comparison sdl.m4 @ 4121:917ca146d901 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 91063c450171
children ebcebb426771
comparison
equal deleted inserted replaced
4120:d07c60f5e460 4121:917ca146d901
18 sdl_exec_prefix="$withval", sdl_exec_prefix="") 18 sdl_exec_prefix="$withval", sdl_exec_prefix="")
19 AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], 19 AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
20 , enable_sdltest=yes) 20 , enable_sdltest=yes)
21 21
22 if test x$sdl_exec_prefix != x ; then 22 if test x$sdl_exec_prefix != x ; then
23 sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" 23 sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
24 if test x${SDL_CONFIG+set} != xset ; then 24 if test x${SDL_CONFIG+set} != xset ; then
25 SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config 25 SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
26 fi 26 fi
27 fi 27 fi
28 if test x$sdl_prefix != x ; then 28 if test x$sdl_prefix != x ; then
29 sdl_args="$sdl_args --prefix=$sdl_prefix" 29 sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
30 if test x${SDL_CONFIG+set} != xset ; then 30 if test x${SDL_CONFIG+set} != xset ; then
31 SDL_CONFIG=$sdl_prefix/bin/sdl-config 31 SDL_CONFIG=$sdl_prefix/bin/sdl-config
32 fi 32 fi
33 fi 33 fi
34 34
40 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) 40 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
41 no_sdl="" 41 no_sdl=""
42 if test "$SDL_CONFIG" = "no" ; then 42 if test "$SDL_CONFIG" = "no" ; then
43 no_sdl=yes 43 no_sdl=yes
44 else 44 else
45 SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` 45 SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
46 SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` 46 SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
47 47
48 sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ 48 sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
49 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 49 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
50 sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ 50 sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
51 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` 51 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
52 sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ 52 sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
53 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` 53 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
54 if test "x$enable_sdltest" = "xyes" ; then 54 if test "x$enable_sdltest" = "xyes" ; then
55 ac_save_CFLAGS="$CFLAGS" 55 ac_save_CFLAGS="$CFLAGS"