- Fixup link with lib/event2 subdir.

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

configure

@@ -17216,6 +17216,16 @@ large outgoing port ranges.  " "$LINENO" 5
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $thedir" >&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"
+
+	if test "x$enable_rpath" = xyes; then
+		if echo "$thedir/lib/event2" | grep "^/" >/dev/null; then
+			RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib/event2"
+		fi
+	fi
+
+	    else
 		    		    if test "$thedir" != "/usr" -a "$thedir" != ""; then
 			LDFLAGS="$LDFLAGS -L$thedir/lib"
 
@@ -17227,6 +17237,7 @@ $as_echo "found in $thedir" >&6; }
 
 		    fi
 	    fi
+        fi
 	# check for library used by libevent after 1.3c
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
 $as_echo_n "checking for library containing clock_gettime... " >&6; }

configure.ac

@@ -799,12 +799,18 @@ large outgoing port ranges.  ])
 		fi
         else
             AC_MSG_RESULT(found in $thedir)
+	    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"
+		    ACX_RUNTIME_PATH_ADD([$thedir/lib/event2])
+	    else
 		    dnl assume /usr is in default path, do not add "".
 		    if test "$thedir" != "/usr" -a "$thedir" != ""; then
 			LDFLAGS="$LDFLAGS -L$thedir/lib"
 			ACX_RUNTIME_PATH_ADD([$thedir/lib])
 		    fi
 	    fi
+        fi
 	# check for library used by libevent after 1.3c
 	AC_SEARCH_LIBS([clock_gettime], [rt])
 

doc/Changelog

@@ -1,5 +1,6 @@
 3 February 2014: Wouter
 	- Detect libevent2 install automatically by configure.
+	- Fixup link with lib/event2 subdir.
 
 31 January 2014: Wouter
 	- unit test for ldns wire to str and back with zones, root, nlnetlabs