diff options
| author | unknown <holyfoot@mysql.com> | 2006-05-02 14:36:05 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-05-02 14:36:05 +0500 |
| commit | 7fb64e0f87b0ad9b97ea63008bb2490077f7f0a7 (patch) | |
| tree | 7ce0d37117be0f77177cb5ee12a212fec4049257 /config | |
| parent | 023d260718dd1fe68ea6979db01fb7136b73ea2e (diff) | |
| parent | fb2c04a15f6bb4a837e312019e18f881d43bbdd8 (diff) | |
| download | mariadb-git-7fb64e0f87b0ad9b97ea63008bb2490077f7f0a7.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.18518
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/openssl.m4 | 5 | ||||
| -rw-r--r-- | config/ac-macros/yassl.m4 | 5 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index 1f9d53abe01..a23c46eed00 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -1,6 +1,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ incs="$1" libs="$2" + eval shrexts=\"$shrext_cmds\" case "$incs---$libs" in ---) for d in /usr/ssl/include /usr/local/ssl/include /usr/include \ @@ -15,7 +16,7 @@ AC_DEFUN([MYSQL_FIND_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_cmds ; then + if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext ; then OPENSSL_LIB=$d fi done @@ -28,7 +29,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 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_cmds ; then + if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext ; then OPENSSL_LIB=$libs fi ;; diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 906a65a2fc3..f6eee32ff84 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -11,8 +11,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT([using bundled yaSSL]) AC_CONFIG_FILES(extra/yassl/Makefile dnl extra/yassl/taocrypt/Makefile dnl + extra/yassl/taocrypt/benchmark/Makefile dnl extra/yassl/taocrypt/src/Makefile dnl - extra/yassl/src/Makefile) + extra/yassl/taocrypt/test/Makefile dnl + extra/yassl/src/Makefile dnl + extra/yassl/testsuite/Makefile) yassl_dir="yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 23cc132aca8..713e7072c6f 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -90,8 +90,9 @@ case $SYSTEM_TYPE in ;; *) # 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_cmds" \) \ + -f "$mysql_zlib_dir/lib/libz$shrext" \) \ -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" |