projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| 88e42654 | 1 | --- mysql-4.1.19/configure.in~ 2006-05-04 22:37:01.424363499 +0300 |
| 2 | +++ mysql-4.1.19/configure.in 2006-05-04 22:39:56.658291086 +0300 | |
| 3 | @@ -817,18 +817,20 @@ | |
| 4 | ||
| 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) | |
| 10 | +AC_CHECK_FUNC(gethostbyname_r, [], | |
| 11 | + [AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
| 12 | + [AC_CHECK_LIB(nsl, gethostbyname_r)])]) | |
| 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)) | |
| 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])) | |
| 22 | +save_LIBS="$LIBS" | |
| 23 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) | |
| 24 | +AC_SUBST(LIBCRYPT) | |
| 25 | +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) | |
| 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)) | |
| 30 | --- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200 | |
| 31 | +++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200 | |
| 32 | @@ -33,7 +33,7 @@ | |
| 33 | libmysql_dir = $(top_srcdir)/libmysql | |
| 34 | ||
| 35 | libmysqlclient_r_la_SOURCES = $(target_sources) | |
| 36 | -libmysqlclient_r_la_LIBADD = $(target_libadd) | |
| 37 | +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread | |
| 38 | libmysqlclient_r_la_LDFLAGS = $(target_ldflags) | |
| 39 | ||
| 40 | # This is called from the toplevel makefile | |
| 41 | --- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200 | |
| 42 | +++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200 | |
| 43 | @@ -43,7 +43,7 @@ | |
| 44 | @bdb_libs@ @innodb_libs@ @pstack_libs@ \ | |
| 45 | @innodb_system_libs@ \ | |
| 46 | @ndbcluster_libs@ @ndbcluster_system_libs@ \ | |
| 3f7f2ce2 AM |
47 | - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ \ |
| 48 | + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ \ | |
| 49 | @MYSQLD_EXTRA_LIBS@ | |
| 88e42654 | 50 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ |
| 51 | item_strfunc.h item_timefunc.h item_uniq.h \ |