From 9dd5ee6a267e639cc62be8082a341dbfedcdc44a Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 3 Feb 2014 11:02:17 +0000
Subject: [PATCH] - Detect libevent2 install automatically by configure.

git-svn-id: file:///svn/unbound/trunk@3064 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 configure     | 2 +-
 configure.ac  | 2 +-
 doc/Changelog | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1b3e61ba4..10563fb53 100755
--- 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 e92836da4..0091ebe45 100644
--- 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 caefec6a2..a5e017212 100644
--- 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.
-- 
2.47.2