[evolution-patches] patch for 57999

[Chris Toshok <toshok ximian com>]

This fixes some additional conflicts between libdb's that might be
linked in.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.136
diff -u -r1.136 ChangeLog
--- ChangeLog	5 Jul 2004 14:58:45 -0000	1.136
+++ ChangeLog	9 Jul 2004 15:16:53 -0000
@@ -1,3 +1,16 @@
+2004-07-09  Chris Toshok  <toshok ximian com>
+
+	[ most likely fixes #57999 ]
+	
+	* libdb/dist/aclocal/options.ac: set the default unique name to
+	"_eds".  this will append _eds to all externally visible libdb
+	symbols, so we can be sure it won't conflict with another libdb
+	(linked dynamically).
+
+	* libdb/dist/configure: regen after options.ac change.
+
+	* libdb/dist/.cvsignore: ignore db_int_def.h
+
 2004-07-02  JP Rosevear  <jpr novell com>
 
 	* configure.in: bump version, libtool numbers
Index: libdb/dist/aclocal/options.ac
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libdb/dist/aclocal/options.ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 options.ac
--- libdb/dist/aclocal/options.ac	20 Nov 2003 22:13:27 -0000	1.1.1.1
+++ libdb/dist/aclocal/options.ac	9 Jul 2004 15:16:54 -0000
@@ -170,7 +170,7 @@
 AC_ARG_WITH(uniquename,
 	[AC_HELP_STRING([--with-uniquename=NAME],
 			[Build a uniquely named library.])],
-	[with_uniquename="$withval"], [with_uniquename="no"])
+	[with_uniquename="$withval"], [with_uniquename="_eds"])
 if test "$with_uniquename" = "no"; then
 	db_cv_uniquename="no"
 	AC_MSG_RESULT($with_uniquename)
Index: libdb/dist/.cvsignore
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libdb/dist/.cvsignore,v
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- libdb/dist/.cvsignore	22 Nov 2003 22:49:08 -0000	1.1
+++ libdb/dist/.cvsignore	9 Jul 2004 15:16:54 -0000
@@ -9,6 +9,7 @@
 db_deadlock
 db_dump
 db_int.h
+db_int_def.h
 db_load
 db_printlog
 db_recover
Index: libdb/dist/configure
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libdb/dist/configure,v
retrieving revision 1.4
diff -u -r1.4 configure
--- libdb/dist/configure	13 Feb 2004 20:09:05 -0000	1.4
+++ libdb/dist/configure	9 Jul 2004 15:17:04 -0000
@@ -1686,7 +1686,7 @@
 
 DB_VERSION_UNIQUE_NAME=_4001
 
-DB_VERSION_STRING="\"Sleepycat Software: Berkeley DB 4.1.25: (February 13, 2004)\""
+DB_VERSION_STRING="\"Sleepycat Software: Berkeley DB 4.1.25: (July  9, 2004)\""
 
 
 # Set the default installation location.
@@ -1967,7 +1967,7 @@
   withval="$with_uniquename"
   with_uniquename="$withval"
 else
-  with_uniquename="no"
+  with_uniquename="_eds_"
 fi;
 if test "$with_uniquename" = "no"; then
 	db_cv_uniquename="no"