--- configure.orig	Thu Apr 12 11:21:35 2001
+++ configure	Thu May 17 14:44:42 2001
@@ -7,6 +7,9 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
+LIBS="$LIBS -L/usr/local/lib"
+SDL_CONFIG="/usr/local/bin/sdl11-config"
+
 # Defaults:
 ac_help=
 ac_default_prefix=/usr/local
@@ -1829,8 +1832,8 @@
 LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -1844,7 +1847,7 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -4603,7 +4606,7 @@
     no_sdl=yes
   else
     SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs | sed 's/-lXxf86vm -lXxf86dga -lXv //g'`
 
     sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -4627,7 +4630,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 char*
 my_strdup (char *str)
@@ -4717,7 +4720,7 @@
 #include "confdefs.h"
 
 #include <stdio.h>
-#include <SDL/SDL.h>
+#include <SDL11/SDL.h>
 
 int main() {
  return 0; 
@@ -5042,7 +5045,7 @@
   cat > conftest.$ac_ext <<EOF
 #line 5044 "configure"
 #include "confdefs.h"
-#include <SDL/SDL_mixer.h>
+#include <SDL11/SDL_mixer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:5049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }