From f1fec466e232c00c668422014029dce9114d3add Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 16 Sep 2009 23:43:19 +0200 Subject: [PATCH] Add a better autoconf check for libevent. --- configure.in | 6 +----- m4/libevent.m4 | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 m4/libevent.m4 diff --git a/configure.in b/configure.in index 0561af8..2dba9be 100644 --- a/configure.in +++ b/configure.in @@ -95,11 +95,6 @@ if test -d /sw/lib ; then LIBS="$LIBS -L/sw/lib" fi -dnl Checks for libraries. - -AC_CHECK_LIB(event, event_init, - [], [AC_MSG_ERROR(libevent is required)]) - dnl Checks for header files. dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies. @@ -158,6 +153,7 @@ dnl These are defined in files in m4/ AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], []) +tinc_LIBEVENT tinc_ZLIB tinc_LZO diff --git a/m4/libevent.m4 b/m4/libevent.m4 new file mode 100644 index 0000000..9bc9ae1 --- /dev/null +++ b/m4/libevent.m4 @@ -0,0 +1,33 @@ +dnl Check to find the libevent headers/libraries + +AC_DEFUN([tinc_LIBEVENT], +[ + AC_ARG_WITH(libevent, + AS_HELP_STRING([--with-libevent=DIR], [libevent base directory, or:]), + [libevent="$withval" + CPPFLAGS="$CPPFLAGS -I$withval/include" + LDFLAGS="$LDFLAGS -L$withval/lib"] + ) + + AC_ARG_WITH(libevent-include, + AS_HELP_STRING([--with-libevent-include=DIR], [libevent headers directory]), + [libevent_include="$withval" + CPPFLAGS="$CPPFLAGS -I$withval"] + ) + + AC_ARG_WITH(libevent-lib, + AS_HELP_STRING([--with-libevent-lib=DIR], [libevent library directory]), + [libevent_lib="$withval" + LDFLAGS="$LDFLAGS -L$withval"] + ) + + AC_CHECK_HEADERS(event.h, + [], + [AC_MSG_ERROR("libevent header files not found."); break] + ) + + AC_CHECK_LIB(event, event_init, + [LIBS="$LIBS -levent"], + [AC_MSG_ERROR("libevent libraries not found.")] + ) +]) -- 2.25.1