diff options
| author | unknown <serg@serg.mylan> | 2004-08-23 13:55:40 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-23 13:55:40 +0200 |
| commit | d40349fbf9cb41ccb84aa83a1e7854e8c98d61e4 (patch) | |
| tree | 90f20aaf959c3c8ca8715858972e36d667108b8c | |
| parent | 40f282d593b83453344136144b7071d9b6e4c025 (diff) | |
| download | mariadb-git-d40349fbf9cb41ccb84aa83a1e7854e8c98d61e4.tar.gz | |
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
| -rw-r--r-- | bdb/dist/configure.ac | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bdb/dist/configure.ac b/bdb/dist/configure.ac index a61b8595322..98cf0f63b39 100644 --- a/bdb/dist/configure.ac +++ b/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. diff --git a/configure.in b/configure.in index 664ffd2a4a1..bbd0f93bfcf 100644 --- a/configure.in +++ b/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" diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index b3db54d305a..2712e0dff48 100644 --- a/libmysqld/examples/Makefile.am +++ b/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) |