diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2008-01-23 13:50:27 -0500 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2008-01-23 13:50:27 -0500 |
commit | 450cd35b89a9b30c0cc193ea7581af68f3546ba9 (patch) | |
tree | 85d4977492a975673503e7a5ab88b89078d2878e /configure.in | |
parent | b1dda58f8c138355b15dbf832bff7746a0f40208 (diff) | |
parent | 63a454d4f44e2ba804c73f8f6f1967f2810afdc7 (diff) | |
download | mariadb-git-450cd35b89a9b30c0cc193ea7581af68f3546ba9.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
configure.in:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 330f4e48453..19dda37cfd8 100644 --- a/configure.in +++ b/configure.in @@ -837,6 +837,7 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) # Check if crypt() exists in libc or libcrypt, sets LIBS if needed AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) +# See if we need a library for address lookup. AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) # For the sched_yield() function on Solaris |