maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2811
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: maria-5.1
timestamp: Sat 2010-01-30 13:39:39 +0100
message:
  now we force at least libevent-1.4
modified:
  config/ac-macros/libevent.m4


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'config/ac-macros/libevent.m4'
--- config/ac-macros/libevent.m4	2010-01-29 20:35:56 +0000
+++ config/ac-macros/libevent.m4	2010-01-30 12:39:39 +0000
@@ -54,9 +54,9 @@
     "" | "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 @@
                  -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