projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| bbc0ff50 JB |
1 | --- mysql-4.0.15/acinclude.m4.orig 2003-10-04 13:43:46.567663608 +0200 |
| 2 | +++ mysql-4.0.15/acinclude.m4 2003-10-04 13:44:02.120299248 +0200 | |
| 3 | @@ -745,7 +745,7 @@ | |
| 2b48aa2e | 4 | |
| bbc0ff50 JB |
5 | for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ |
| 6 | /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do | |
| 7 | - if test -f $d/libssl.a ; then | |
| 8 | + if test -f $d/libssl.so -o -f $d/libssl.a ; then | |
| 9 | OPENSSL_LIB=$d | |
| 10 | fi | |
| 11 | done | |
| 12 | @@ -757,7 +757,7 @@ | |
| 13 | if test -f $incs/openssl/ssl.h ; then | |
| 14 | OPENSSL_INCLUDE=-I$incs | |
| 15 | fi | |
| 16 | - if test -f $libs/libssl.a ; then | |
| 17 | + if test -f $libs/libssl.so -o -f $libs/libssl.a ; then | |
| 18 | OPENSSL_LIB=$libs | |
| 19 | fi | |
| 20 | ;; | |
| 21 | --- mysql-4.0.15/configure.in.orig 2003-10-04 13:29:18.000000000 +0200 | |
| 22 | +++ mysql-4.0.15/configure.in 2003-10-04 13:46:50.506700624 +0200 | |
| 23 | @@ -746,19 +746,21 @@ | |
| d451850c | 24 | |
| bbc0ff50 JB |
25 | AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) |
| 26 | ||
| 27 | -AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 28 | - AC_CHECK_LIB(nsl, gethostbyname_r)) | |
| 29 | -AC_CHECK_FUNC(gethostbyname_r) | |
| 30 | +AC_CHECK_FUNC(gethostbyname_r, [], | |
| 31 | +[AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 32 | + [AC_CHECK_LIB(nsl, gethostbyname_r)])]) | |
| 33 | ||
| 34 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | |
| 35 | -AC_CHECK_FUNC(yp_get_default_domain, , | |
| 36 | - AC_CHECK_LIB(nsl, yp_get_default_domain)) | |
| 37 | AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) | |
| 38 | # This may get things to compile even if bind-8 is installed | |
| 39 | AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) | |
| 40 | # For crypt() on Linux | |
| 41 | -AC_CHECK_LIB(crypt, crypt) | |
| 42 | +save_LIBS="$LIBS" | |
| 43 | +LIBCRYPT= | |
| 44 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) | |
| 45 | +AC_SUBST(LIBCRYPT) | |
| 46 | AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) | |
| 47 | +LIBS="$save_LIBS" | |
| 48 | ||
| 49 | # For sem_xxx functions on Solaris 2.6 | |
| 50 | AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) | |
| 51 | --- mysql-4.0.15/libmysql_r/Makefile.am.orig 2003-10-04 13:29:16.000000000 +0200 | |
| 52 | +++ mysql-4.0.15/libmysql_r/Makefile.am 2003-10-04 13:47:15.957831464 +0200 | |
| 53 | @@ -30,7 +30,7 @@ | |
| 54 | libmysql_dir = $(top_srcdir)/libmysql | |
| 55 | ||
| 56 | libmysqlclient_r_la_SOURCES = $(target_sources) | |
| 57 | -libmysqlclient_r_la_LIBADD = $(target_libadd) | |
| 58 | +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread | |
| 59 | libmysqlclient_r_la_LDFLAGS = $(target_ldflags) | |
| 60 | ||
| 61 | # This is called from the toplevel makefile | |
| 62 | --- mysql-4.0.15/sql/Makefile.am.orig 2003-09-06 08:35:50.000000000 +0200 | |
| 63 | +++ mysql-4.0.15/sql/Makefile.am 2003-10-04 13:47:34.660988152 +0200 | |
| 64 | @@ -43,7 +43,7 @@ | |
| 65 | mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ | |
| 66 | @bdb_libs@ @innodb_libs@ @pstack_libs@ \ | |
| 67 | @innodb_system_libs@ \ | |
| 68 | - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ | |
| 69 | + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ | |
| 70 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ | |
| 71 | item_strfunc.h item_timefunc.h item_uniq.h \ | |
| 72 | item_create.h mysql_priv.h \ |