diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-02-19 20:13:17 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-02-19 20:13:17 -0500 |
| commit | fc58b42fbfa0f0381efc68e5dd0f5e83f75500c1 (patch) | |
| tree | 3e16ad05aae1c1841b1980db8b815b2f3f44ff94 /sql/Makefile.am | |
| parent | dc7eafea57a321c92716b5b84c574a0347ade74f (diff) | |
| download | mariadb-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 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index a8fe9fc233f..7d4fd86878a 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -20,7 +20,9 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) -INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include \ +INCLUDES = @MT_INCLUDES@ \ + @bdb_includes@ @innobase_includes@ \ + -I$(srcdir)/../include \ -I$(srcdir)/../regex \ -I$(srcdir) -I../include -I.. -I. WRAPLIBS= @WRAPLIBS@ @@ -37,7 +39,9 @@ LDADD = ../isam/libnisam.a \ ../dbug/libdbug.a \ ../regex/libregex.a \ ../strings/libmystrings.a -mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ @bdb_libs@ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) +mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ + @bdb_libs@ @innobase_libs@ \ + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h mysql_priv.h \ |