diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-06 22:16:29 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-06 22:16:29 +0200 |
| commit | 4d710469be9b534825fee784c8cdaba7bbe6f626 (patch) | |
| tree | 48cad987d98f4b1ef08599af6ae65e1410ce4947 /acinclude.m4 | |
| parent | 749246cc2933b6fd74dd8c171de52d87d7bd75bd (diff) | |
| parent | c13baf70ec937501389ed6e9f94c98635f1c1b76 (diff) | |
| download | mariadb-git-4d710469be9b534825fee784c8cdaba7bbe6f626.tar.gz | |
merge
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 830157423c1..85149d64dc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -846,21 +846,21 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_BDB], [ AC_ARG_WITH([berkeley-db], - [\ + [ --with-berkeley-db[=DIR] Use BerkeleyDB located in DIR], [bdb="$withval"], [bdb=no]) AC_ARG_WITH([berkeley-db-includes], - [\ + [ --with-berkeley-db-includes=DIR Find Berkeley DB headers in DIR], [bdb_includes="$withval"], [bdb_includes=default]) AC_ARG_WITH([berkeley-db-libs], - [\ + [ --with-berkeley-db-libs=DIR Find Berkeley DB libraries in DIR], [bdb_libs="$withval"], @@ -1108,7 +1108,7 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_ARG_WITH([innodb], - [\ + [ --without-innodb Do not include the InnoDB table handler], [innodb="$withval"], [innodb=yes]) @@ -1182,6 +1182,7 @@ dnl END OF MYSQL_CHECK_INNODB SECTION dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- + dnl Got this from the GNU tar 1.13.11 distribution dnl by Paul Eggert <eggert@twinsun.com> dnl --------------------------------------------------------------------------- |