--- configure.orig	Tue May 17 16:23:18 2005
+++ configure	Thu Oct 13 14:33:11 2005
@@ -20037,7 +20037,7 @@
 {
   SDLIMAGE="yes"
   SDL_LIBS="$SDL_LIBS -lSDL_image"
-  CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
+  CPPFLAGS="$CPPFLAGS `%%SDL_CONFIG%% --cflags`"
 }
 
 ForceSDLImage()
@@ -20338,7 +20338,7 @@
 if test x$enable_sdlimage = xyes; then
   if test x$enable_force_sdlimage = xno; then
 
-for ac_header in SDL/SDL_image.h
+for ac_header in SDL_image.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -20790,7 +20790,7 @@
 if test x$enable_sdl = xyes; then
   if test x$enable_force_sdl = xno; then
 
-for ac_header in SDL/SDL.h
+for ac_header in SDL.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -20939,8 +20939,8 @@
 
 done
 
-    # Extract the first word of "sdl-config", so it can be a program name with args.
-set dummy sdl-config; ac_word=$2
+    # Extract the first word of "%%SDL_CONFIG_ONLY%%", so it can be a program name with args.
+set dummy %%SDL_CONFIG_ONLY%%; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_HAVE_SDL+set}" = set; then