summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <tim@threads.polyesthetic.msg>2001-02-19 20:13:17 -0500
committerunknown <tim@threads.polyesthetic.msg>2001-02-19 20:13:17 -0500
commitfc58b42fbfa0f0381efc68e5dd0f5e83f75500c1 (patch)
tree3e16ad05aae1c1841b1980db8b815b2f3f44ff94 /configure.in
parentdc7eafea57a321c92716b5b84c574a0347ade74f (diff)
downloadmariadb-git-fc58b42fbfa0f0381efc68e5dd0f5e83f75500c1.tar.gz
Portability and bug fixes for Innobase.
Add --with-innobase-db to configure. acconfig.h: HAVE_INNOBASE_DB acinclude.m4: add MYSQL_CHECK_INNOBASE configure.in: use MYSQL_CHECK_INNOBASE and configure innobase directory innobase/configure.in: add AM_MAINTAINER_MODE innobase/include/lock0types.h: define lock_t innobase/include/os0file.h: define S_IRWX[UGO] if needed innobase/include/os0sync.h: use pthread_cond_t instead of mutex innobase/include/sync0types.h: define mutex_t innobase/os/os0sync.c: use pthread_cond_t instead of mutex sql/Makefile.am: add @innobase_{includes,libs}@ sql/ha_innobase.cc: fix casts
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 64524fd20d8..56027305bdf 100644
--- a/configure.in
+++ b/configure.in
@@ -1833,6 +1833,7 @@ AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS])
MYSQL_CHECK_BDB
+MYSQL_CHECK_INNOBASE
# If we have threads generate some library functions and test programs
@@ -1898,6 +1899,16 @@ mysql-noinstall-hack:' \
AC_DEFINE(HAVE_BERKELEY_DB)
fi
+ if test X"$have_innobase_db" = Xyes
+ then
+ sql_server_dirs="innobase $sql_server_dirs"
+ echo "CONFIGURING FOR INNOBASE DB"
+ (cd innobase && sh ./configure) \
+ || AC_MSG_ERROR([could not configure Innobase DB])
+
+ echo "END OF INNOBASE DB CONFIGURATION"
+ fi
+
if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
then
# MIT user level threads