From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 15 Apr 2014 11:14:50 +0000 (+0000)
Subject: - If event2 is installed, include dir/include/event2 in compilation.
X-Git-Tag: release-1.5.0rc1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d77903c5044e1256ac4af926217778db15a471;p=thirdparty%2Funbound.git

- If event2 is installed, include dir/include/event2 in compilation.


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

diff --git a/configure b/configure
index 213fa3b03..b7ff98c4f 100755
--- a/configure
+++ b/configure
@@ -17225,6 +17225,7 @@ large outgoing port ranges.  " "$LINENO" 5
 $as_echo "found in $thedir" >&6; }
 	    	    if test ! -f $thedir/lib/libevent.a -a ! -f $thedir/lib/libevent.so -a -d "$thedir/lib/event2"; then
 		    LDFLAGS="$LDFLAGS -L$thedir/lib/event2"
+		    CPPFLAGS="$CPPFLAGS -L$thedir/include/event2"
 
 	if test "x$enable_rpath" = xyes; then
 		if echo "$thedir/lib/event2" | grep "^/" >/dev/null; then
diff --git a/configure.ac b/configure.ac
index 28ff07748..6befcf11b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -807,6 +807,7 @@ large outgoing port ranges.  ])
 	    dnl if event2 exists and no event lib in dir itself, use subdir
 	    if test ! -f $thedir/lib/libevent.a -a ! -f $thedir/lib/libevent.so -a -d "$thedir/lib/event2"; then
 		    LDFLAGS="$LDFLAGS -L$thedir/lib/event2"
+		    CPPFLAGS="$CPPFLAGS -L$thedir/include/event2"
 		    ACX_RUNTIME_PATH_ADD([$thedir/lib/event2])
 	    else
 		    dnl assume /usr is in default path, do not add "".
diff --git a/doc/Changelog b/doc/Changelog
index a3c0c6c44..7b1bd47b5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+15 April 2014: Wouter
+	- If event2 is installed, include dir/include/event2 in compilation.
+
 11 April 2014: Wouter
 	- Fix #502: explain that do-ip6 disable does not stop AAAA lookups,
 	  but it stops the use of the ipv6 transport layer for DNS traffic.