<usual/event.h>

diff --git a/configure.ac b/configure.ac
index 08ad48d53c27fb59e90e7e4ce9eb6756b258e3f8..13163b6f40f39ef2ad68e1f7881444cb3cc3eaba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,54 +74,7 @@ AC_SEARCH_LIBS(regcomp, regex, [], AC_MSG_ERROR([regcomp not found]))
 AC_CHECK_FUNCS(crypt lstat)
 
 dnl Find libevent
-levent=yes
-AC_MSG_CHECKING([for libevent])
-AC_ARG_WITH(libevent,
-  AC_HELP_STRING([--with-libevent=prefix],[Specify where libevent is installed]),
-  [ if test "$withval" = "no"; then
-     levent=no
-    else
-      CPPFLAGS="$CPPFLAGS -I$withval/include"
-      LDFLAGS="$LDFLAGS -L$withval/lib"
-    fi
-  ])
-
-if test "$levent" = "no"; then
-  AC_MSG_RESULT([using usual/event])
-  AC_DEFINE(HAVE_EVENT_LOOPBREAK, 1, [usual/event.h has it.])
-  have_libevent=no
-else # libevent
-AC_DEFINE(HAVE_LIBEVENT, 1, [Use real libevent.])
-LIBS="-levent $LIBS"
-AC_LINK_IFELSE([
-  #include <sys/types.h>
-  #include <sys/time.h>
-  #include <stdio.h>
-  #include <event.h>
-  int main(void) {
-    struct event ev;
-    event_init();
-    event_set(&ev, 1, EV_READ, NULL, NULL);
-    /* this checks for 1.2+ but next we check for 1.3b+ anyway */
-    /* event_base_free(NULL); */
-  } ],
-[AC_MSG_RESULT([found])],
-[AC_MSG_ERROR([not found, cannot proceed])])
-
-dnl libevent < 1.3b crashes on event_base_free()
-dnl no good way to check libevent version.  use hack:
-dnl evhttp.h defines HTTP_SERVUNAVAIL only since 1.3b
-AC_MSG_CHECKING([whether libevent version >= 1.3b])
-AC_EGREP_CPP([HTTP_SERVUNAVAIL],
-[#include <evhttp.h>
-  HTTP_SERVUNAVAIL ],
-[AC_MSG_ERROR([no, cannot proceed])],
-[AC_MSG_RESULT([yes])])
-
-AC_CHECK_FUNCS(event_loopbreak)
-have_libevent=yes
-fi # libevent
-AC_SUBST(have_libevent)
+AC_USUAL_LIBEVENT(1)
 
 AC_USUAL_DEBUG
 AC_USUAL_CASSERT

diff --git a/include/bouncer.h b/include/bouncer.h
index 72c614e73e5efed3ae770b28cb9fb5ffc34d824e..7747a560b51778856cb4cc71308da1beed16beb4 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -33,8 +33,7 @@
 #include <usual/socket.h>
 #include <usual/safeio.h>
 #include <usual/mbuf.h>
-
-#include <event.h>
+#include <usual/event.h>
 
 #ifdef DBGVER
 #define FULLVER   PACKAGE_NAME " version " PACKAGE_VERSION " (" DBGVER ")"