diff options
| author | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
|---|---|---|
| committer | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
| commit | f10d01a747267e169d9f0b80d30a71b00f0bce7c (patch) | |
| tree | f2093400a62fb1870556251762c63545c99eb586 /acinclude.m4 | |
| parent | f76d2ce34f4947648fc910669b4639182da6dbaa (diff) | |
| parent | b26c1ed58a6a8026d48b7f27ff9620f61e9a84b0 (diff) | |
| download | mariadb-git-f10d01a747267e169d9f0b80d30a71b00f0bce7c.tar.gz | |
Resolved changes between example storage engine and NDB storage engine.
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Merged in example storage engine with NDB
configure.in:
Resolved conflict between NDB check with EXAMPLE DB.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a67273f3ed8..677c3cc9e99 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1303,6 +1303,36 @@ dnl END OF MYSQL_CHECK_INNODB SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- +dnl Macro: MYSQL_CHECK_EXAMPLEDB +dnl Sets HAVE_EXAMPLE_DB if --with-example-storage-engine is used +dnl --------------------------------------------------------------------------- +AC_DEFUN([MYSQL_CHECK_EXAMPLEDB], [ + AC_ARG_WITH([example-storage-engine], + [ + --with-example-storage-engine + Enable the Example Storge Engine], + [exampledb="$withval"], + [exampledb=no]) + AC_MSG_CHECKING([for example storage engine]) + + case "$exampledb" in + yes ) + AC_DEFINE(HAVE_EXAMPLE_DB) + AC_MSG_RESULT([yes]) + [exampledb=yes] + ;; + * ) + AC_MSG_RESULT([no]) + [exampledb=no] + ;; + esac + +]) +dnl --------------------------------------------------------------------------- +dnl END OF MYSQL_CHECK_EXAMPLE SECTION +dnl --------------------------------------------------------------------------- + +dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CHECK_NDBCLUSTER dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used dnl --------------------------------------------------------------------------- @@ -1343,6 +1373,7 @@ dnl END OF MYSQL_CHECK_NDBCLUSTER SECTION dnl --------------------------------------------------------------------------- +>>>>>>> dnl By default, many hosts won't let programs access large files; dnl one must use special compiler options to get large-file access to work. dnl For more details about this brain damage please see: |