diff options
| author | kent@mysql.com <> | 2006-03-31 01:03:45 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-03-31 01:03:45 +0200 |
| commit | 50b08681412a45af9a9895e7d2cdbce67bd27bb2 (patch) | |
| tree | eba6f67eac0bec5f6eaada6dd20ae0e2616ac514 /config | |
| parent | ea2aaa4e2fc5f9f7acd9c3ce369d2f13cb2d7d09 (diff) | |
| download | mariadb-git-50b08681412a45af9a9895e7d2cdbce67bd27bb2.tar.gz | |
zlib.m4, openssl.m4:
Use when testing if shared library exists, bug#16332
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/openssl.m4 | 6 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index aa46dd45360..1f9d53abe01 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -14,7 +14,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \ /usr/freeware/lib32 /usr/local/lib/ ; do - if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then + # Just to be safe, we test for ".so" anyway + if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then OPENSSL_LIB=$d fi done @@ -26,7 +27,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ if test -f $incs/openssl/ssl.h ; then OPENSSL_INCLUDE=-I$incs fi - if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then + # Just to be safe, we test for ".so" anyway + if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then OPENSSL_LIB=$libs fi ;; diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index ec55f19b98f..8aafb3f4ced 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -89,8 +89,9 @@ case $SYSTEM_TYPE in fi ;; *) + # Just to be safe, we test for ".so" anyway 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" \) \ + -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \ -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" |