[evolution-patches] patch for #52708

[Chris Toshok <toshok ximian com>]

this changes the configure.ac slightly for our embedded libdb. 
Specifying neither -rpath nor -static on the command line for libtool
causes it to build a convenience library (the same thing that happens
when you specify noinst_LTLIBRARIES in an automake file.)  So, we just
always build with libtool now.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.99
diff -u -r1.99 ChangeLog
--- ChangeLog	12 Feb 2004 19:26:27 -0000	1.99
+++ ChangeLog	13 Feb 2004 19:02:06 -0000
@@ -1,3 +1,15 @@
+2004-02-13  Chris Toshok  <toshok ximian com>
+
+	* libedataserver/Makefile.am (libedataserver_la_LIBADD): use
+	libdb-4.1.la instead of libdb.a.
+
+	* libdb/dist/configure.ac: remove all the static/shared logic and
+	force libtool to be used.  also, remove -rpath from the SOFLAGS.
+	without -rpath and -static libtool builds the equivalent of a
+	noinst_ automake library.
+
+	* libdb/dist/configure: regen configure from configure.ac.
+
 2004-02-12  Chris Toshok  <toshok ximian com>
 
 	* configure.in (AM_PATH_ORBIT2): up our requirement to 2.9.8.
Index: libdb/dist/configure.ac
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libdb/dist/configure.ac,v
retrieving revision 1.3
diff -u -r1.3 configure.ac
--- libdb/dist/configure.ac	25 Nov 2003 23:30:21 -0000	1.3
+++ libdb/dist/configure.ac	13 Feb 2004 19:02:06 -0000
@@ -254,11 +254,10 @@
 CCC=CXX
 
 # Libtool configuration.
-AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 
 LIBTOOL="\$(SHELL) ./libtool"
-SOFLAGS="-rpath \$(libdir)"
+SOFLAGS=""
 
 # Set SOSUFFIX and friends
 SOSUFFIX_CONFIG
@@ -274,21 +273,9 @@
 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
 
-# Configure for shared libraries, static libraries, or both.  If both are
-# configured, build the utilities and example programs with shared versions.
-#
-# $o is set to ".o" or ".lo", and is the file suffix used in the Makefile
-# instead of .o
-if test "$enable_shared" = "no"; then
-	DEFAULT_LIB="\$(libdb)"
-	POSTLINK="@true"
-	o=".o"
-fi
-if test "$enable_shared" = "yes"; then
-	DEFAULT_LIB="\$(libso_target)"
-	POSTLINK="\$(LIBTOOL) --mode=execute true"
-	o=".lo"
-fi
+DEFAULT_LIB="\$(libso_target)"
+POSTLINK="\$(LIBTOOL) --mode=execute true"
+o=".lo"
 INSTALL_LIBS="$DEFAULT_LIB"
 
 # Optional C++ API.
Index: libedataserver/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- libedataserver/Makefile.am	7 Jan 2004 13:41:40 -0000	1.13
+++ libedataserver/Makefile.am	13 Feb 2004 19:02:06 -0000
@@ -34,7 +34,7 @@
 	md5-utils.c
 
 libedataserver_la_LIBADD = 				\
-	$(top_builddir)/libdb/dist/libdb.a
+	$(top_builddir)/libdb/dist/libdb-4.1.la
 
 libedataserver_la_LDFLAGS = 										\
 	-version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)