63 lines
2.0 KiB
Plaintext
63 lines
2.0 KiB
Plaintext
--- dist/configure.orig Mon Jul 31 18:58:18 2000
|
|
+++ dist/configure Thu Oct 28 12:28:52 2010
|
|
@@ -728,7 +728,7 @@ echo "$ac_t""no" 1>&6
|
|
|
|
|
|
o=.o
|
|
-INSTALLER="\$(cp)"
|
|
+INSTALLER="\${BSD_INSTALL_PROGRAM}"
|
|
DEFAULT_LIB="\$(libdb)"
|
|
DEFAULT_INSTALL="install_static"
|
|
|
|
@@ -1602,7 +1602,6 @@ echo "configure:1601: checking libtool configuration"
|
|
${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
|
|
--no-verify $srcdir/ltmain.sh \
|
|
--output=./libtool $host_os \
|
|
- --disable-static \
|
|
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
|
|
|
SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
|
|
@@ -1615,9 +1614,11 @@ echo "configure:1601: checking libtool configuration"
|
|
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${SAVE_CXX}"
|
|
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
|
|
|
|
- INSTALLER="\$(LIBTOOL) --mode=install cp"
|
|
+ INSTALLER="\$(LIBTOOL) --mode=install \${BSD_INSTALL_PROGRAM}"
|
|
POSTLINK="\$(LIBTOOL) --mode=execute true"
|
|
- SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
|
|
+ dbLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_la_LDFLAGS}"
|
|
+ dbcxxLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_cxx_la_LDFLAGS}"
|
|
+ dbtclLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} \${libdb_tcl_la_LDFLAGS}"
|
|
SOFLAGS="-rpath \$(libdir)"
|
|
o=".lo"
|
|
fi
|
|
@@ -1936,7 +1937,7 @@ echo "configure:1911: checking for existence of $TCL_B
|
|
TCFLAGS="-I$TCL_PREFIX/include"
|
|
fi
|
|
|
|
- LIBS="$LIBS $TCL_LIB_SPEC $TCL_LIBS"
|
|
+ LIBTSO_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
|
|
|
|
ADDITIONAL_LIBS="$ADDITIONAL_LIBS \$(libtso_target)"
|
|
DEFAULT_INSTALL="${DEFAULT_INSTALL} install_tcl"
|
|
@@ -3911,7 +3912,7 @@ else
|
|
#line 3912 "configure"
|
|
#include "confdefs.h"
|
|
main(){
|
|
-#if defined(i386)
|
|
+#if defined(__i386__)
|
|
#if defined(__GNUC__)
|
|
exit(0);
|
|
#endif
|
|
@@ -5359,7 +5360,9 @@ s%@MAKEFILE_CXX@%$MAKEFILE_CXX%g
|
|
s%@POSTLINK@%$POSTLINK%g
|
|
s%@RPC_OBJS@%$RPC_OBJS%g
|
|
s%@SOFLAGS@%$SOFLAGS%g
|
|
-s%@SOLINK@%$SOLINK%g
|
|
+s%@dbLINK@%$dbLINK%g
|
|
+s%@dbcxxLINK@%$dbcxxLINK%g
|
|
+s%@dbtclLINK@%$dbtclLINK%g
|
|
s%@SOSUFFIX@%$SOSUFFIX%g
|
|
s%@o@%$o%g
|
|
s%@DB_VERSION_MAJOR@%$DB_VERSION_MAJOR%g
|