diff options
| author | unknown <kent@mysql.com> | 2006-04-27 11:38:48 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-27 11:38:48 +0200 |
| commit | e187468d24be1b1dc6989b241379cc667d8b565a (patch) | |
| tree | 2169c285793e2df19c9396678ef3fa80afec6d43 /configure.in | |
| parent | 96f58e1b268fdcf0c495efacd05268f1ad6f23ad (diff) | |
| parent | c8e2e3fd96499cd3c4303f77fc14ca27fd736aad (diff) | |
| download | mariadb-git-e187468d24be1b1dc6989b241379cc667d8b565a.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 74ac7ed4574..7c9b4fd3790 100644 --- a/configure.in +++ b/configure.in @@ -735,9 +735,8 @@ AC_CHECK_FUNC(yp_get_default_domain, , AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) # This may get things to compile even if bind-8 is installed AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) -# For crypt() on Linux -AC_CHECK_LIB(crypt, crypt) -AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) +# Check if crypt() exists in libc or libcrypt, sets LIBS if needed +AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) # For sem_xxx functions on Solaris 2.6 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) |