From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 15 Jan 2008 13:19:59 +0000 (+0000)
Subject: fixup for -levent.
X-Git-Tag: release-0.9~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71723c627644544c66aec9162abbf65b10768d42;p=thirdparty%2Funbound.git

fixup for -levent.


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

diff --git a/configure b/configure
index a319cbb78..0478b9368 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index e501d58ee..a075362f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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