upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixup link with lib/event2 subdir.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3065 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2014-02-03 11:41:19 +00:00
parent 9dd5ee6a26
commit acc7548b07
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure vendored
View file

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

14
configure.ac
View file

@ -799,10 +799,16 @@ large outgoing port ranges. ])
fi fi
else else
AC_MSG_RESULT(found in $thedir) AC_MSG_RESULT(found in $thedir)
dnl assume /usr is in default path, do not add "". dnl if event2 exists and no event lib in dir itself, use subdir
if test "$thedir" != "/usr" -a "$thedir" != ""; then if test ! -f $thedir/lib/libevent.a -a ! -f $thedir/lib/libevent.so -a -d "$thedir/lib/event2"; then
LDFLAGS="$LDFLAGS -L$thedir/lib" LDFLAGS="$LDFLAGS -L$thedir/lib/event2"
ACX_RUNTIME_PATH_ADD([$thedir/lib]) 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
fi fi
# check for library used by libevent after 1.3c # check for library used by libevent after 1.3c

1
doc/Changelog
View file

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