diff options
| author | unknown <joreland@mysql.com> | 2004-08-24 13:29:11 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-24 13:29:11 +0200 |
| commit | 3acbc220a8c19e3b19d361e882ebecc8b6173f8e (patch) | |
| tree | 0edda70a93b5a42405a81fe6df1341e40e3bc37f /configure.in | |
| parent | 207d4484fa07d4ce8df13d4cd34213efb68fd8cb (diff) | |
| parent | 62ef255977db4454dbe2a951a016082e0af54f33 (diff) | |
| download | mariadb-git-3acbc220a8c19e3b19d361e882ebecc8b6173f8e.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index f58ba482c59..9a902d17305 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 4.1.4-beta) +AM_INIT_AUTOMAKE(mysql, 4.1.4-gamma) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -2821,7 +2821,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" |