39 lines
1.7 KiB
Plaintext
39 lines
1.7 KiB
Plaintext
--- configure.orig Wed Oct 9 00:32:30 2002
|
|
+++ configure Sat Feb 18 22:49:57 2006
|
|
@@ -3830,13 +3830,2 @@
|
|
|
|
-# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
|
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
|
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
|
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
|
|
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
|
|
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
|
|
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
|
|
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
|
|
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
|
-
|
|
# Reload cache, that may have been modified by ltconfig
|
|
@@ -3864,16 +3853,2 @@
|
|
LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
|
|
-lt_save_CC="$CC"
|
|
-lt_save_CFLAGS="$CFLAGS"
|
|
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
|
|
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
|
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
|
|
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
|
|
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
|
|
-deplibs_check_method="$deplibs_check_method" \
|
|
-file_magic_cmd="$file_magic_cmd" \
|
|
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
|
|
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
|
|
-|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
|
|
-CC="$lt_save_CC"
|
|
-CFLAGS="$lt_save_CFLAGS"
|
|
|
|
@@ -8705,3 +8680,3 @@
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-ldb-4.0 $LIBS"
|
|
+LIBS="-ldb-4.0 $USER_LDFLAGS $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|