Commit 413c348f authored by Sergei Golubchik's avatar Sergei Golubchik

now we force at least libevent-1.4

parent 90dc23e0
...@@ -54,9 +54,9 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [ ...@@ -54,9 +54,9 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [
"" | "yes") "" | "yes")
libevent_includes="" libevent_includes=""
libevent_libs="-levent" libevent_libs="-levent"
AC_CHECK_LIB(event, event_get_version,[with_libevent=system], AC_CHECK_LIB(event, evutil_socketpair,[with_libevent=system],
[with_libevent=bundled]) [with_libevent=bundled])
AC_CHECK_HEADER(event.h,,[with_libevent=bundled]) AC_CHECK_HEADER(evutil.h,,[with_libevent=bundled])
if test "$with_libevent" = "bundled"; then if test "$with_libevent" = "bundled"; then
MYSQL_USE_BUNDLED_LIBEVENT MYSQL_USE_BUNDLED_LIBEVENT
fi fi
...@@ -67,10 +67,10 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [ ...@@ -67,10 +67,10 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [
-f "$with_libevent/lib/libevent.so" -o \ -f "$with_libevent/lib/libevent.so" -o \
-f "$with_libevent/lib/libevent.sl" -o \ -f "$with_libevent/lib/libevent.sl" -o \
-f "$with_libevent/lib/libevent.dylib" \) \ -f "$with_libevent/lib/libevent.dylib" \) \
-a -f "$with_libevent/include/event.h"; then -a -f "$with_libevent/include/evutil.h"; then
libevent_includes="-I$with_libevent/include" libevent_includes="-I$with_libevent/include"
libevent_libs="-L$with_libevent/lib -levent" libevent_libs="-L$with_libevent/lib -levent"
AC_CHECK_LIB(event, event_get_version,[with_libevent=$with_libevent], AC_CHECK_LIB(event, evutil_socketpair,[with_libevent=$with_libevent],
[with_libevent=no], [$libevent_libs]) [with_libevent=no], [$libevent_libs])
else else
with_libevent=no with_libevent=no
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment