Added support for db1 emulation in Berkeley DB3. DB3 needs

        * configure.in: Added support for db1 emulation in Berkeley DB3.
        DB3 needs --enable-compat185.

        * README: Describe solutions of linking errors with mozilla libs
        (partially copied from Galeon's FAQ).

3 files changed, 50 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 02bef1802..9d9aa8631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-22  Stanislav Brabec  <utx@penguin.cz>
+
+	* configure.in: Added support for db1 emulation in Berkeley DB3.
+	DB3 needs --enable-compat185.
+
+	* README: Describe solutions of linking errors with mozilla libs
+	(partially copied from Galeon's FAQ).
+
 2001-01-22  Robin * Slomkowski  <rslomkow@eazel.com>
 
 	* configure.in: upped version to 0.8.1 to be higher
diff --git a/README b/README
index 29c73e1a9..10f41b3e2 100644
--- a/README
+++ b/README
@@ -283,6 +283,43 @@ need to do some environment setup for the Mozilla component:
 export MOZILLA_FIVE_HOME=/foo/bar/mozilla/dist/bin
 export LD_LIBRARY_PATH=/foo/bar/mozilla/dist/bin:$LD_LIBRARY_PATH
 
+If you experience linking problems (e. g. undefined reference to
+`nsString type_info node'), please note that both applications
+(mozilla and nautilus) must be compiled not only with the same version
+of compiler, but also with the same compiler flags. Download the right
+mozilla package for your distribution (see upper). If you have built
+Mozilla from source, Mozilla by default adds CXXFLAGS -fno-rtti and
+-fno-exceptions or -fno-handle-exceptions (depends on gcc version).
+You have two chances to make things in sync:
+
+1)
+Compile mozilla with this .mozconfig script: (You must place it in your home directory)
+
+# sh
+# Build configuration script
+#
+# See http://www.mozilla.org/build/unix.html for build instructions.
+#
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --enable-strip-libs
+ac_add_options --enable-cpp-rtti
+ac_add_options --disable-mailnews
+ac_add_options --enable-optimize
+
+2)
+Configure mozilla with standard configure script and compile it.
+Before configuring Nautilus set proper CXXFLAGS. For example with
+latest gcc it means:
+
+CXXFLAGS='-fno-rtti -fno-exceptions'
+export CXXFLAGS
+
+For more see configure.in in mozilla source. You can save some space by
+disabling RTTI.
+
 Finally, you can disable the Mozilla component (even if Mozilla
 development libraries are installed in your system) as follows:
 
diff --git a/configure.in b/configure.in
index 3b9a8f3d3..9c9f42961 100644
--- a/configure.in
+++ b/configure.in
@@ -399,10 +399,11 @@ then
 	dnl =>
 	AC_CHECK_LIB(popt, poptParseArgvString, [rpm_libs="$rpm_libs -lpopt"])
 	AC_CHECK_FUNC(dbopen, [],
-	  AC_CHECK_LIB(db2, dbopen, [rpm_libs="$rpm_libs -ldb2"],
-	    AC_CHECK_LIB(db1, dbopen, [rpm_libs="$rpm_libs -ldb1"],
-	      AC_CHECK_LIB(db, dbopen, [rpm_libs="$rpm_libs -ldb"],
-	         AC_MSG_ERROR([sorry rpm requires a db-1.85 API]))))
+	  AC_CHECK_LIB(db-3, __db185_open, [rpm_libs="$rpm_libs -ldb-3"],
+	    AC_CHECK_LIB(db2, dbopen, [rpm_libs="$rpm_libs -ldb2"],
+	      AC_CHECK_LIB(db1, dbopen, [rpm_libs="$rpm_libs -ldb1"],
+		AC_CHECK_LIB(db, dbopen, [rpm_libs="$rpm_libs -ldb"],
+		  AC_MSG_ERROR([sorry rpm requires a db-1.85 API])))))
 	             )
 	AC_CHECK_LIB(rpmio, Fdopen, [rpm_libs="$rpm_libs -lrpmio"],[],$rpm_libs)
 	AC_CHECK_LIB(rpm, rpmRunTransactions,[have_rpm=yes],