projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| f7ba939a AM |
1 | diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in |
| 2 | --- mysql-4.1.7.org/configure.in 2004-10-27 01:35:54.930172056 +0200 | |
| 3 | +++ mysql-4.1.7/configure.in 2004-10-27 01:39:04.368373072 +0200 | |
| 4 | @@ -779,19 +779,20 @@ | |
| d451850c | 5 | |
| bbc0ff50 JB |
6 | AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) |
| 7 | ||
| 8 | -AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 9 | - AC_CHECK_LIB(nsl, gethostbyname_r)) | |
| 10 | -AC_CHECK_FUNC(gethostbyname_r) | |
| 823380c5 | 11 | +AC_CHECK_FUNC(gethostbyname_r, [], |
| f7ba939a AM |
12 | + [AC_CHECK_LIB(nsl_r, gethostbyname_r, [], |
| 13 | + [AC_CHECK_LIB(nsl, gethostbyname_r)])]) | |
| bbc0ff50 JB |
14 | |
| 15 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | |
| 16 | -AC_CHECK_FUNC(yp_get_default_domain, , | |
| 17 | - AC_CHECK_LIB(nsl, yp_get_default_domain)) | |
| 18 | AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) | |
| 19 | # This may get things to compile even if bind-8 is installed | |
| 20 | AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) | |
| 21 | # For crypt() on Linux | |
| 22 | -AC_CHECK_LIB(crypt, crypt) | |
| 23 | +save_LIBS="$LIBS" | |
| bbc0ff50 JB |
24 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) |
| 25 | +AC_SUBST(LIBCRYPT) | |
| f7ba939a | 26 | AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) |
| bbc0ff50 JB |
27 | +LIBS="$save_LIBS" |
| 28 | ||
| 29 | # For sem_xxx functions on Solaris 2.6 | |
| 30 | AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) | |
| f7ba939a AM |
31 | diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am |
| 32 | --- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200 | |
| 33 | +++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200 | |
| 34 | @@ -33,7 +33,7 @@ | |
| bbc0ff50 JB |
35 | libmysql_dir = $(top_srcdir)/libmysql |
| 36 | ||
| 37 | libmysqlclient_r_la_SOURCES = $(target_sources) | |
| 38 | -libmysqlclient_r_la_LIBADD = $(target_libadd) | |
| 39 | +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread | |
| 40 | libmysqlclient_r_la_LDFLAGS = $(target_ldflags) | |
| 41 | ||
| 42 | # This is called from the toplevel makefile | |
| f7ba939a AM |
43 | diff -urN mysql-4.1.7.org/sql/Makefile.am mysql-4.1.7/sql/Makefile.am |
| 44 | --- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200 | |
| 45 | +++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200 | |
| bbc0ff50 | 46 | @@ -43,7 +43,7 @@ |
| bbc0ff50 JB |
47 | @bdb_libs@ @innodb_libs@ @pstack_libs@ \ |
| 48 | @innodb_system_libs@ \ | |
| f7ba939a | 49 | @ndbcluster_libs@ @ndbcluster_system_libs@ \ |
| bbc0ff50 JB |
50 | - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ |
| 51 | + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ | |
| 52 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ | |
| 53 | item_strfunc.h item_timefunc.h item_uniq.h \ | |
| f7ba939a | 54 | item_create.h item_subselect.h item_row.h \ |