diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:32:43 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:32:43 +0200 |
| commit | 40bcc3e570a3d4a5bcbf04e810ec06c4a59b4731 (patch) | |
| tree | 85480edbb0a4469e7e982c6c5d82cdcd32727d5a /config | |
| parent | 144c7622c7906ac554b5bbaa60c4e89113dac1e5 (diff) | |
| parent | 07b431d1d81fa4ec2150c429578b65022cfab42d (diff) | |
| download | mariadb-git-40bcc3e570a3d4a5bcbf04e810ec06c4a59b4731.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
into neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818
config/ac-macros/zlib.m4:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/openssl.m4 | 10 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index a23c46eed00..af4305486a3 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -15,8 +15,9 @@ 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 - # 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 ; then + # Test for libssl using all known library file endings + if test -f $d/libssl.a || test -f $d/libssl.so || \ + test -f $d/libssl.sl || test -f $d/libssl.dylib ; then OPENSSL_LIB=$d fi done @@ -28,8 +29,9 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ if test -f $incs/openssl/ssl.h ; then OPENSSL_INCLUDE=-I$incs fi - # 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 ; then + # Test for libssl using all known library file endings + if test -f $d/libssl.a || test -f $d/libssl.so || \ + test -f $d/libssl.sl || test -f $d/libssl.dylib ; then OPENSSL_LIB=$libs fi ;; diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 713e7072c6f..17b951d4723 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -89,10 +89,11 @@ case $SYSTEM_TYPE in fi ;; *) - # Just to be safe, we test for ".so" anyway - eval shrexts=\"$shrext_cmds\" - if test \( -f "$mysql_zlib_dir/lib/libz.a" -o -f "$mysql_zlib_dir/lib/libz.so" -o \ - -f "$mysql_zlib_dir/lib/libz$shrext" \) \ + # Test for libz using all known library file endings + 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" |