--- configure.orig Thu May 29 06:47:26 2003 +++ configure Thu Jun 5 22:11:02 2003 @@ -419,7 +419,7 @@ PACKAGE_STRING='pinball 0.3.0' 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 @@ -1879,12 +1879,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 @@ -3258,16 +3258,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 - INCLTDL='-I${top_srcdir}/''libltdl' - # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -7866,7 +7856,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' @@ -7963,7 +7954,7 @@ use_allegro="no" fi; -if test x"$use_allegro" == "xno"; then +if test x"$use_allegro" = "xno"; then cat >>confdefs.h <<\_ACEOF @@ -9996,7 +9987,7 @@ use_unittest="no" fi; -if test x"$use_unittest" == "xyes"; then +if test x"$use_unittest" = "xyes"; then @@ -10517,14 +10508,14 @@ # 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 use_debug="no" fi; -if test x"$use_debug" == "xyes"; then +if test x"$use_debug" = "xyes"; then cat >>confdefs.h <<\_ACEOF #define EM_DEBUG 1 @@ -11187,8 +11178,8 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CPP@,$CPP,;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