diff options
| author | unknown <joerg@mysql.com> | 2005-10-31 18:35:26 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-10-31 18:35:26 +0100 |
| commit | b1a1b4815fa31dc638cb89524f0776f301cdb16f (patch) | |
| tree | b216fef79ebfdbfba11414eb68a4c018d29cb962 /acinclude.m4 | |
| parent | a006453fad260a35df973a8785f0d9a8977c1cac (diff) | |
| download | mariadb-git-b1a1b4815fa31dc638cb89524f0776f301cdb16f.tar.gz | |
Accept any shared library for "libz", not just the static one. Bug#6584
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 9c7271f7cc9..0a5778285ea 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -310,8 +310,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 |