Mercurial > sdl-ios-xcode

comparison test/acinclude.m4 @ 1659:14717b52abc0 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents 31c2b8e4885e
children
comparison
equal deleted inserted replaced
1658:e49147870aac 1659:14717b52abc0
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_args="$sdl_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_args="$sdl_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
35 PATH="$prefix/bin:$prefix/usr/bin:$PATH" 35 if test "x$prefix" != xNONE; then
36 PATH="$prefix/bin:$prefix/usr/bin:$PATH"
37 fi
36 AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) 38 AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
37 min_sdl_version=ifelse([$1], ,0.11.0,$1) 39 min_sdl_version=ifelse([$1], ,0.11.0,$1)
38 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) 40 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
39 no_sdl="" 41 no_sdl=""
40 if test "$SDL_CONFIG" = "no" ; then 42 if test "$SDL_CONFIG" = "no" ; then