generate #line references to source .xrc files in wxrc --gettext (patch #1803492...

[wxWidgets.git] / build / aclocal / sdl.m4

diff --git a/build/aclocal/sdl.m4 b/build/aclocal/sdl.m4
index f5fb1f4ddd571e7898a866218636e464286ec606..0928a9ddfa17ca926bf0140df21dbf1a29f6c489 100644 (file)
--- a/build/aclocal/sdl.m4
+++ b/build/aclocal/sdl.m4
@@ -20,20 +20,21 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
                    , enable_sdltest=yes)
 
   if test x$sdl_exec_prefix != x ; then
                    , enable_sdltest=yes)
 
   if test x$sdl_exec_prefix != x ; then

-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-     fi
+    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+    if test x${SDL_CONFIG+set} != xset ; then
+      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+    fi

   fi
   if test x$sdl_prefix != x ; then
   fi
   if test x$sdl_prefix != x ; then

-     sdl_args="$sdl_args --prefix=$sdl_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-     fi
+    sdl_args="$sdl_args --prefix=$sdl_prefix"
+    if test x${SDL_CONFIG+set} != xset ; then
+      SDL_CONFIG=$sdl_prefix/bin/sdl-config
+    fi

   fi
 
   fi
 

-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  if test "x$prefix" != xNONE; then
+    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+  fi

   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)