bdb bugfix: LTLIBOBJS didn't take --disable-shared into account

fix for bdb not ending up into libmysqld.a


bdb/dist/configure.ac:
  bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
configure.in:
  build bdb with --disable-shared for libdb.a to go into libmysqld.a
libmysqld/examples/Makefile.am:
  incorrect "bugfix" undone. bdb should be in libmysqld.a

bdb/dist/configure.ac

@@ -555,7 +555,7 @@ fi
 LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
 	     sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
 LTLIBOBJS=`echo "$LIB@&t@OBJS" |
-	   sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
+	   sed "s,\.[[^.]]* ,$o ,g;s,\.[[^.]]*$,$o,"`
 AC_SUBST(LTLIBOBJS)
 
 # Initial output file list.

configure.in

@@ -2823,7 +2823,7 @@ then
       AC_CONFIG_FILES(bdb/Makefile)
 
       echo "CONFIGURING FOR BERKELEY DB" 
-      bdb_conf_flags=
+      bdb_conf_flags="--disable-shared"
       if test $with_debug = "yes"
       then
         bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic"

libmysqld/examples/Makefile.am

@@ -16,7 +16,7 @@ DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes)
 LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
-LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @bdb_libs_with_path@ @LIBDL@ $(CXXLDFLAGS)
+LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
 mysqltest_LINK = $(CXXLINK)