From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 15 Jan 2008 12:54:11 +0000 (+0000)
Subject: set ldflags during levent test.
X-Git-Tag: release-0.9~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d8e117ef410092261971622f94d64f8757181a;p=thirdparty%2Funbound.git

set ldflags during levent test.


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

diff --git a/configure b/configure
index bf2466922..59778e420 100755
--- a/configure
+++ b/configure
@@ -21705,6 +21705,7 @@ 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
@@ -21712,6 +21713,7 @@ echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
 echo "${ECHO_T}found in $thedir" >&6; }
                 	CPPFLAGS="$CPPFLAGS -I$thedir";
             		LATE_LDFLAGS="$thedir/*.lo";
+			LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
 		else
             		{ { echo "$as_me:$LINENO: error: Cannot find the libevent library in $withval
 You can restart ./configure --with-libevent=no to use a builtin alternative.
@@ -22061,6 +22063,7 @@ _ACEOF
 fi
 done
  # only in libevent 1.4? and later
+	LDFLAGS="$BAK_LDFLAGS"
 else
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index b380fc112..b175e45e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,12 +506,14 @@ 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";
             		LATE_LDFLAGS="$thedir/*.lo";
+			LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
 		else
             		AC_MSG_ERROR([Cannot find the libevent library in $withval
 You can restart ./configure --with-libevent=no to use a builtin alternative.
@@ -530,6 +532,7 @@ 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"
 else
 	AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events])
 fi