--- configure.orig	Mon Feb 23 06:32:33 2004
+++ configure	Wed Mar 17 19:23:24 2004
@@ -21171,7 +21171,7 @@
 
 
 SDL_CFLAGS=""
-SDL_LIBS="-lSDL"
+SDL_LIBS="-lSDL-1.1"
 
 
 case "$target" in
@@ -25926,8 +25926,8 @@
 #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
             ;;
         *-*-freebsd*)
-            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-            pthread_lib="-pthread"
+            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
+            pthread_lib="${PTHREAD_LIBS}"
             ;;
         *-*-netbsd*)
             pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
@@ -28394,14 +28394,13 @@
 fi
 
 
-        if test x$have_usb_h = xyes; then
-            CFLAGS="$CFLAGS -DHAVE_USB_H"
-        fi
         if test x$have_usbhid_h = xyes; then
             CFLAGS="$CFLAGS -DHAVE_USBHID_H"
         fi
         if test x$have_libusb_h = xyes; then
+	    if test x$have_libusbhid_h = xno; then
             CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
+	    fi
         fi
         if test x$have_libusbhid_h = xyes; then
             CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"