Commit e187468d authored by unknown's avatar unknown
Browse files

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
parents 96f58e1b c8e2e3fd

configure.in

+2 −3
Original line number Diff line number Diff line
@@ -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))