diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
| commit | 515c747dcfcca8d04a509496c5864f302d6d76be (patch) | |
| tree | 87a4027a65ad98a422987c566b6d394464e95623 /acinclude.m4 | |
| parent | 41972bea9234345ed36ea92d40c0b0cf3ec315b0 (diff) | |
| parent | cef1d752497f81229788e56abaf7fa62c1ab31a9 (diff) | |
| download | mariadb-git-515c747dcfcca8d04a509496c5864f302d6d76be.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8778cc0b015..79caa4338ac 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -880,6 +880,7 @@ dnl echo "DBG2: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" no ) bdb_includes= bdb_libs= + bdb_libs_with_path= ;; supplied-two ) MYSQL_CHECK_INSTALLED_BDB([$bdb_includes], [$bdb_libs]) @@ -909,6 +910,7 @@ dnl echo "DBG2: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" esac bdb_includes= bdb_libs= + bdb_libs_with_path= ;; esac ;; @@ -937,6 +939,7 @@ dnl echo "DBG3: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" AC_SUBST(bdb_includes) AC_SUBST(bdb_libs) + AC_SUBST(bdb_libs_with_path) ]) AC_DEFUN([MYSQL_CHECK_INSTALLED_BDB], [ @@ -957,6 +960,7 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"] MYSQL_TOP_BUILDDIR([lib]) bdb_includes="-I$inc" bdb_libs="-L$lib -ldb" + bdb_libs_with_path="$lib/libdb.a" ]) LDFLAGS="$save_LDFLAGS" else @@ -985,6 +989,7 @@ dnl echo ["MYSQL_CHECK_BDB_DIR ($1)"] MYSQL_TOP_BUILDDIR([dir]) bdb_includes="-I$dir/build_unix" bdb_libs="-L$dir/build_unix -ldb" + bdb_libs_with_path="$dir/build_unix/libdb.a" else bdb_dir_ok="$bdb_version_ok" fi @@ -1096,6 +1101,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_DEFINE(HAVE_INNOBASE_DB) have_innodb="yes" innodb_includes="-I../innobase/include" + innodb_system_libs="" dnl Some libs are listed several times, in order for gcc to sort out dnl circular references. innodb_libs="\ @@ -1136,7 +1142,7 @@ dnl circular references. \$(top_builddir)/innobase/os/libos.a\ \$(top_builddir)/innobase/ut/libut.a" - AC_CHECK_LIB(rt, aio_read, [innodb_libs="$innodb_libs -lrt"]) + AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"]) ;; * ) AC_MSG_RESULT([Not using Innodb]) @@ -1145,6 +1151,7 @@ dnl circular references. AC_SUBST(innodb_includes) AC_SUBST(innodb_libs) + AC_SUBST(innodb_system_libs) ]) dnl --------------------------------------------------------------------------- |