projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| 3f8fcf96 ER |
1 | --- mysql-5.1.21-beta/configure.in~ 2007-08-29 19:00:29.000000000 +0300 |
| 2 | +++ mysql-5.1.21-beta/configure.in 2007-08-29 19:00:35.000000000 +0300 | |
| 5c32ba8a | 3 | @@ -836,8 +836,9 @@ |
| d451850c | 4 | |
| bbc0ff50 JB |
5 | AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) |
| 6 | ||
| 7 | -AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 8 | - AC_CHECK_LIB(nsl, gethostbyname_r)) | |
| 5c32ba8a AM |
9 | +AC_CHECK_FUNC(gethostbyname_r, [], [ |
| 10 | + AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 11 | + AC_CHECK_LIB(nsl, gethostbyname_r)) ]) | |
| 12 | AC_CHECK_FUNC(gethostbyname_r) | |
| bbc0ff50 | 13 | |
| 5c32ba8a AM |
14 | AC_SEARCH_LIBS(setsockopt, socket) |
| 15 | @@ -845,6 +846,11 @@ | |
| 16 | AC_SEARCH_LIBS(bind, bind) | |
| 923c2da0 | 17 | # Check if crypt() exists in libc or libcrypt, sets LIBS if needed |
| 5c32ba8a | 18 | AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) |
| bbc0ff50 | 19 | +save_LIBS="$LIBS" |
| bbc0ff50 JB |
20 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) |
| 21 | +AC_SUBST(LIBCRYPT) | |
| 3f8fcf96 | 22 | +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) |
| bbc0ff50 | 23 | +LIBS="$save_LIBS" |
| 1011e763 AM |
24 | # See if we need a library for address lookup. |
| 25 | AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) | |
| bbc0ff50 | 26 | |
| 3f8fcf96 ER |
27 | --- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300 |
| 28 | +++ mysql-5.1.21-beta/sql/Makefile.am 2007-08-29 19:01:33.000000000 +0300 | |
| 29 | @@ -43,7 +43,7 @@ | |
| 139c9b47 ER |
30 | @pstack_libs@ \ |
| 31 | @mysql_plugin_libs@ \ | |
| 48d72527 | 32 | $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ |
| 3f8fcf96 ER |
33 | - $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ |
| 34 | + $(yassl_libs) $(openssl_libs) @LIBCRYPT@ @MYSQLD_EXTRA_LIBS@ | |
| 139c9b47 | 35 | |
| bbc0ff50 | 36 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ |
| 3f8fcf96 | 37 | item_strfunc.h item_timefunc.h \ |
| c4e36f31 JB |
38 | --- mysql-5.1.26-rc/config/ac-macros/ssl.m4.orig 2008-07-01 00:35:01.000000000 +0200 |
| 39 | +++ mysql-5.1.26-rc/config/ac-macros/ssl.m4 2008-08-25 19:53:00.258254465 +0200 | |
| 40 | @@ -102,7 +102,12 @@ | |
| 41 | # | |
| 42 | # Try to link with openSSL libs in <location> | |
| 43 | # | |
| 44 | - openssl_libs="-L$location/lib/ -lssl -lcrypto" | |
| 45 | + if test "$location" != "/usr" | |
| 46 | + then | |
| 47 | + openssl_libs="-L$location/lib -lssl -lcrypto" | |
| 48 | + else | |
| 49 | + openssl_libs="-lssl -lcrypto" | |
| 50 | + fi | |
| 51 | MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) | |
| 52 | ||
| 53 | if test "$mysql_ssl_found" == "no" |