- Detect libevent2 install automatically by configure.

git-svn-id: file:///svn/unbound/trunk@3064 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 1b3e61ba4da425ac3e2217838cb949ee74a0a938..10563fb53d239e55038f9ac65a527d104732dd19 100755 (executable)
--- a/configure
+++ b/configure
@@ -17179,7 +17179,7 @@ $as_echo_n "checking for libevent... " >&6; }
         fi
         for dir in $withval; do
             thedir="$dir"
-            if test -f "$dir/include/event.h"; then
+            if test -f "$dir/include/event.h" -o -f "$dir/include/event2/event.h"; then
                 found_libevent="yes"
                                if test "$thedir" != "/usr"; then
                     CPPFLAGS="$CPPFLAGS -I$thedir/include"

diff --git a/configure.ac b/configure.ac
index e92836da4aae3040cd67893ad2e85f45604cb20b..0091ebe45f6b42b10ebb87173a6d281d22152129 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -763,7 +763,7 @@ if test x_$withval = x_yes -o x_$withval != x_no; then
         fi
         for dir in $withval; do
             thedir="$dir"
-            if test -f "$dir/include/event.h"; then
+            if test -f "$dir/include/event.h" -o -f "$dir/include/event2/event.h"; then
                 found_libevent="yes"
                dnl assume /usr is in default path.
                if test "$thedir" != "/usr"; then

diff --git a/doc/Changelog b/doc/Changelog
index caefec6a2a0612ac60c88c49aa679e6f3eb9e7ee..a5e017212386adc55cb78bee8a6f886b2bef2407 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 February 2014: Wouter
+       - Detect libevent2 install automatically by configure.
+
 31 January 2014: Wouter
        - unit test for ldns wire to str and back with zones, root, nlnetlabs
          and types.sidnlabs.