projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| 923c2da0 ER |
1 | --- mysql-5.0.24/configure.in~ 2006-08-07 01:15:28.845040985 +0300 |
| 2 | +++ mysql-5.0.24/configure.in 2006-08-07 02:06:21.203404560 +0300 | |
| 3 | @@ -737,18 +737,20 @@ | |
| 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)) | |
| 9 | -AC_CHECK_FUNC(gethostbyname_r) | |
| 823380c5 | 10 | +AC_CHECK_FUNC(gethostbyname_r, [], |
| f7ba939a AM |
11 | + [AC_CHECK_LIB(nsl_r, gethostbyname_r, [], |
| 12 | + [AC_CHECK_LIB(nsl, gethostbyname_r)])]) | |
| bbc0ff50 JB |
13 | |
| 14 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | |
| 15 | -AC_CHECK_FUNC(yp_get_default_domain, , | |
| 16 | - AC_CHECK_LIB(nsl, yp_get_default_domain)) | |
| 17 | AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) | |
| 18 | # This may get things to compile even if bind-8 is installed | |
| 19 | AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) | |
| 923c2da0 ER |
20 | # Check if crypt() exists in libc or libcrypt, sets LIBS if needed |
| 21 | -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) | |
| bbc0ff50 | 22 | +save_LIBS="$LIBS" |
| bbc0ff50 JB |
23 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) |
| 24 | +AC_SUBST(LIBCRYPT) | |
| 923c2da0 | 25 | +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) |
| bbc0ff50 JB |
26 | +LIBS="$save_LIBS" |
| 27 | ||
| 28 | # For sem_xxx functions on Solaris 2.6 | |
| 29 | AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) | |
| 22202458 ER |
30 | --- mysql-5.0.21/libmysql_r/Makefile.am~ 2006-05-02 16:55:15.179229923 +0300 |
| 31 | +++ mysql-5.0.21/libmysql_r/Makefile.am 2006-05-02 16:56:08.080408785 +0300 | |
| a46c2f9a | 32 | @@ -32,7 +32,7 @@ |
| bbc0ff50 JB |
33 | libmysql_dir = $(top_srcdir)/libmysql |
| 34 | ||
| 35 | libmysqlclient_r_la_SOURCES = $(target_sources) | |
| 22202458 ER |
36 | -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) |
| 37 | +libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) -lpthread | |
| bbc0ff50 JB |
38 | libmysqlclient_r_la_LDFLAGS = $(target_ldflags) |
| 39 | ||
| 40 | # This is called from the toplevel makefile | |
| 139c9b47 ER |
41 | --- mysql-5.1.16-beta/sql/Makefile.am~ 2007-03-01 20:52:59.905932538 +0200 |
| 42 | +++ mysql-5.1.16-beta/sql/Makefile.am 2007-03-01 20:53:31.026631850 +0200 | |
| 43 | @@ -40,7 +40,7 @@ | |
| 44 | @pstack_libs@ \ | |
| 45 | @mysql_plugin_libs@ \ | |
| 48d72527 | 46 | $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ |
| 139c9b47 ER |
47 | - $(yassl_libs) $(openssl_libs) |
| 48 | + $(yassl_libs) $(openssl_libs) @LIBCRYPT | |
| 49 | ||
| bbc0ff50 | 50 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ |
| 139c9b47 | 51 | item_strfunc.h item_timefunc.h \ |