diff options
| author | ram@ram.(none) <> | 2002-10-31 17:12:53 +0400 |
|---|---|---|
| committer | ram@ram.(none) <> | 2002-10-31 17:12:53 +0400 |
| commit | e65fd5d5743a44fdc78739e58ae605788a5a263f (patch) | |
| tree | f4b7ba4b82c7806829efcf7b8f81c5fe22b4baf2 | |
| parent | 9e3f16dfcdc8b877b474bad55b0c4d3e0a6ffe3c (diff) | |
| parent | e3a2033d4105bb6c31b9a7d9221ab3a71114ad5f (diff) | |
| download | mariadb-git-e65fd5d5743a44fdc78739e58ae605788a5a263f.tar.gz | |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into ram.(none):/home/ram/work/mysql-4.1
| -rw-r--r-- | BUILD/FINISH.sh | 3 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 4e30024985b..82f31a14dc4 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -14,8 +14,7 @@ $make -k clean || true /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache aclocal && autoheader && aclocal && automake && autoconf -# TODO: remove when DBD will be OK -#(cd bdb/dist && sh s_all) +(cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] then diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 2b52b133133..69ff8f535fd 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -11,7 +11,7 @@ DEFS = -DEMBEDDED_LIBRARY INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes) LIBS = @LIBS@ -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @bdb_libs_with_path@ @LIBDL@ $(CXXLDFLAGS) mysqltest_SOURCES = mysqltest.c |