Commit a09301c4 authored by Sam Lantinga's avatar Sam Lantinga

Damien Carbery fixed bug #542

In SDL 1.2.13 sdl.m4 the AM_PATH_SDL function looks for sdl-config.
It sets the PATH:
 PATH="$prefix/bin:$prefix/usr/bin:$PATH"
but does not save the current PATH or restore the current PATH at the end.

This breaks the build on Solaris because we have GNU tools in another dir
(listed at the top of PATH) but non-GNU tools with the same names in
$prefix/bin. Later configure tests finds the non-GNU tools and quits in error

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402710
parent 76b4e077
...@@ -32,10 +32,12 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run ...@@ -32,10 +32,12 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
fi fi
fi fi
as_save_PATH="$PATH"
if test "x$prefix" != xNONE; then if test "x$prefix" != xNONE; then
PATH="$prefix/bin:$prefix/usr/bin:$PATH" PATH="$prefix/bin:$prefix/usr/bin:$PATH"
fi fi
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
PATH="$as_save_PATH"
min_sdl_version=ifelse([$1], ,0.11.0,$1) min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl="" no_sdl=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment