fixup for -levent.

git-svn-id: file:///svn/unbound/trunk@859 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-01-15 13:19:59 +00:00
parent 219d0c70dd
commit 71723c6276
2 changed files with 8 additions and 4 deletions

6
configure vendored
View file

@ -21849,13 +21849,13 @@ echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
break;
fi
done
BAK_LDFLAGS="$LDFLAGS"
if test x_$found_libevent != x_yes; then
if test -f "$dir/event.h" -a -f "$dir/libevent.la"; then
# libevent source directory
{ echo "$as_me:$LINENO: result: found in $thedir" >&5
echo "${ECHO_T}found in $thedir" >&6; }
CPPFLAGS="$CPPFLAGS -I$thedir";
BAK_LDFLAGS="$LDFLAGS"
LATE_LDFLAGS="$thedir/*.lo";
LDFLAGS="$thedir/*.o $LDFLAGS"
else
@ -22207,7 +22207,9 @@ _ACEOF
fi
done
# only in libevent 1.4? and later
LDFLAGS="$BAK_LDFLAGS"
if test -n "$BAK_LDFLAGS"; then
LDFLAGS="$BAK_LDFLAGS"
fi
else
cat >>confdefs.h <<\_ACEOF

View file

@ -510,12 +510,12 @@ if test x_$withval != x_no; then
break;
fi
done
BAK_LDFLAGS="$LDFLAGS"
if test x_$found_libevent != x_yes; then
if test -f "$dir/event.h" -a -f "$dir/libevent.la"; then
# libevent source directory
AC_MSG_RESULT(found in $thedir)
CPPFLAGS="$CPPFLAGS -I$thedir";
BAK_LDFLAGS="$LDFLAGS"
LATE_LDFLAGS="$thedir/*.lo";
LDFLAGS="$thedir/*.o $LDFLAGS"
else
@ -536,7 +536,9 @@ many outgoing ports. ])
AC_CHECK_HEADERS([event.h],,, [AC_INCLUDES_DEFAULT])
AC_CHECK_FUNCS([event_base_free]) # only in libevent 1.2 and later
AC_CHECK_FUNCS([event_base_once]) # only in libevent 1.4? and later
LDFLAGS="$BAK_LDFLAGS"
if test -n "$BAK_LDFLAGS"; then
LDFLAGS="$BAK_LDFLAGS"
fi
else
AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events])
fi