diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-01-30 13:39:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-01-30 13:39:39 +0100 |
| commit | 7cb11859c7ba09709546038078e0617da9fa9537 (patch) | |
| tree | 552470bd1f411310618b0954de55a2f72450426c /config | |
| parent | d25273ed223a54b5d983709e07d6ef52ce9c6ef6 (diff) | |
| download | mariadb-git-7cb11859c7ba09709546038078e0617da9fa9537.tar.gz | |
now we force at least libevent-1.4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/libevent.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/ac-macros/libevent.m4 b/config/ac-macros/libevent.m4 index a3479fbf0ca..73fa59a1d3c 100644 --- a/config/ac-macros/libevent.m4 +++ b/config/ac-macros/libevent.m4 @@ -54,9 +54,9 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [ "" | "yes") libevent_includes="" 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]) - AC_CHECK_HEADER(event.h,,[with_libevent=bundled]) + AC_CHECK_HEADER(evutil.h,,[with_libevent=bundled]) if test "$with_libevent" = "bundled"; then MYSQL_USE_BUNDLED_LIBEVENT fi @@ -67,10 +67,10 @@ AC_DEFUN([MYSQL_CHECK_LIBEVENT], [ -f "$with_libevent/lib/libevent.so" -o \ -f "$with_libevent/lib/libevent.sl" -o \ -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_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]) else with_libevent=no |