- Fixup link with lib/event2 subdir.

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

diff --git a/configure b/configure
index 10563fb53d239e55038f9ac65a527d104732dd19..fac5a15171ed1be23922dea5f04ae81469c2dd90 100755 (executable)
--- a/configure
+++ b/configure
@@ -17216,8 +17216,18 @@ 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 "$thedir" != "/usr" -a "$thedir" != ""; then
-                LDFLAGS="$LDFLAGS -L$thedir/lib"
+                   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"
 
        if test "x$enable_rpath" = xyes; then
                if echo "$thedir/lib" | grep "^/" >/dev/null; then
@@ -17225,6 +17235,7 @@ $as_echo "found in $thedir" >&6; }
                fi
        fi
 
+                   fi
            fi
         fi
        # check for library used by libevent after 1.3c

diff --git a/configure.ac b/configure.ac
index 0091ebe45f6b42b10ebb87173a6d281d22152129..42e8e6e2128a912047f24b97626f40736d2e9691 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -799,10 +799,16 @@ large outgoing port ranges.  ])
                fi
         else
             AC_MSG_RESULT(found in $thedir)
-           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])
+           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

diff --git a/doc/Changelog b/doc/Changelog
index a5e017212386adc55cb78bee8a6f886b2bef2407..e00c80623050a2623c041b9c9df0e0241ede1e5b 100644 (file)
--- a/doc/Changelog
+++ b/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