diff options
| author | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
| commit | 68717638d572dac02b82511809d3b5f9023c0872 (patch) | |
| tree | 5bb56d7c3d40836dcfebc8a965a7fc7eab54177b /acinclude.m4 | |
| parent | 3fd639493aea5c340acc2e28617e8d917d54ff7d (diff) | |
| parent | b18f2c2a89d3896873a2df20e443a6a0b953cccf (diff) | |
| download | mariadb-git-68717638d572dac02b82511809d3b5f9023c0872.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
acinclude.m4:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 429d93f91a8..769f2170256 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -256,9 +256,10 @@ case $SYSTEM_TYPE in AC_ARG_WITH([zlib-dir], AC_HELP_STRING([--with-zlib-dir=DIR], [Provide MySQL with a custom location of - compression library. Given DIR, zlib binary is + compression library. Given DIR, zlib library is assumed to be in $DIR/lib and header files - in $DIR/include.]), + in $DIR/include. Specify "bundled" to use + bundled zlib.]), [mysql_zlib_dir=${withval}], [mysql_zlib_dir=""]) case "$mysql_zlib_dir" in |