diff options
| author | unknown <joerg@mysql.com> | 2005-11-01 20:49:02 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-01 20:49:02 +0100 |
| commit | dced93482062f1bf0294ed82d9408781d76879ee (patch) | |
| tree | 58be55054c0fce91d99b91ef050e1c51bc92fb23 /config | |
| parent | 1752d848dfdd32c52425c61f6bbc725d7d28f1c6 (diff) | |
| download | mariadb-git-dced93482062f1bf0294ed82d9408781d76879ee.tar.gz | |
config/ac-macros/zlib.m4
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
config/ac-macros/zlib.m4:
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/zlib.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 94a26f33dd3..22cf9542cf0 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -89,8 +89,9 @@ case $SYSTEM_TYPE in fi ;; *) - if test -f "$mysql_zlib_dir/lib/libz.a" -a \ - -f "$mysql_zlib_dir/include/zlib.h"; then + if test \( -f "$mysql_zlib_dir/lib/libz.a" -o -f "$mysql_zlib_dir/lib/libz.so" -o \ + -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \ + -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" MYSQL_CHECK_ZLIB_DIR |