diff options
| author | unknown <kent@mysql.com> | 2006-03-29 23:51:23 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-29 23:51:23 +0200 |
| commit | 2d8acd2fdcd4c1dc49e58dc98babc85ff6d62838 (patch) | |
| tree | 096bbba84462958e98f851c9b57f55bdb7b77280 /acinclude.m4 | |
| parent | 92df85b43adb2651a74a7178076de4b01cffbdac (diff) | |
| download | mariadb-git-2d8acd2fdcd4c1dc49e58dc98babc85ff6d62838.tar.gz | |
mysqld_safe.sh:
Added --help option, bug#16392
acinclude.m4:
Use "$shrext_cmds" when testing if shared library exists, bug#16332
acinclude.m4:
Use "$shrext_cmds" when testing if shared library exists, bug#16332
scripts/mysqld_safe.sh:
Added --help option, bug#16392
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0a5778285ea..d9b8030696d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -310,8 +310,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" @@ -976,7 +977,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 @@ -988,7 +990,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 ;; |