From a09301c4f18d416ebb1d21dfb3341003d91a7a8c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 24 Jan 2008 15:50:20 +0000 Subject: [PATCH] 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 --- sdl.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdl.m4 b/sdl.m4 index 25581ea00..4a10202d4 100644 --- a/sdl.m4 +++ b/sdl.m4 @@ -32,10 +32,12 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run fi fi + as_save_PATH="$PATH" if test "x$prefix" != xNONE; then PATH="$prefix/bin:$prefix/usr/bin:$PATH" fi AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + PATH="$as_save_PATH" min_sdl_version=ifelse([$1], ,0.11.0,$1) AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) no_sdl=""