--- configure.orig	Wed Dec 10 12:34:54 2003
+++ configure	Thu Dec 11 20:59:05 2003
@@ -431,7 +431,7 @@
 PACKAGE_STRING='pinball 0.3.1'
 PACKAGE_BUGREPORT='henqvist@users.sourceforge.net'
 
-ac_subdirs_all="$ac_subdirs_all libltdl"
+ac_subdirs_all="$ac_subdirs_all"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1954,12 +1954,12 @@
 
 
 
-CFLAGS="-g -W -Wall -O2"
-CXXFLAGS="-g -W -Wall -O2"
+#CFLAGS="-g -W -Wall -O2"
+#CXXFLAGS="-g -W -Wall -O2"
 
 
 
-subdirs="$subdirs libltdl"
+subdirs="$subdirs"
 
 
 ac_ext=c
@@ -3439,18 +3439,6 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-  case $enable_ltdl_convenience in
-  no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
-echo "$as_me: error: this package needs a convenience libltdl" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/''libltdl'
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -8303,7 +8291,8 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="--disable-ltlibs $ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -11061,7 +11050,7 @@
 
 
 # Check whether --with-debug or --without-debug was given.
-if test "${with_debug+set}" = set; then
+if test "set${with_debug}" = "set"; then
   withval="$with_debug"
   use_debug="yes"
 else
@@ -11788,8 +11777,8 @@
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@INCLTDL@,$INCLTDL,;t t
-s,@LIBLTDL@,$LIBLTDL,;t t
+s,@INCLTDL@,,;t t
+s,@LIBLTDL@,,;t t
 s,@EM_DATADIR@,$EM_DATADIR,;t t
 s,@EM_LIBDIR@,$EM_LIBDIR,;t t
 s,@EM_BUILD_ROOT@,$EM_BUILD_ROOT,;t t