- 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 213fa3b036e6c6aebfdb2208005f7dabf242b521..b7ff98c4fdb27841657b6723d00498ad40226110 100755 (executable)
--- 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 28ff07748155ecec19ae815f3b978caa5d68a99f..6befcf11b5eadb1075dd8fa3e01c270ede9220d1 100644 (file)
--- 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 a3c0c6c447328578c6ebf322fc8af09d8ddacaa0..7b1bd47b54fdd7c43d727221a72a7477b6836d22 100644 (file)
--- 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.