From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 10 Jan 2008 14:00:07 +0000 (+0000)
Subject: libevent .lo file linking.
X-Git-Tag: release-0.9~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe6f28ddc514f824fa5d924359c48053794542cd;p=thirdparty%2Funbound.git

libevent .lo file linking.


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

diff --git a/configure b/configure
index a5f9bfa9b..3e3ff5b76 100755
--- a/configure
+++ b/configure
@@ -21684,12 +21684,12 @@ echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
             fi
         done
         if test x_$found_libevent != x_yes; then
-		if test -f "$dir/event.h" -a -f "$dir/.libs/libevent.a"; 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";
-            		LDFLAGS="$thedir/.libs/*.o $LDFLAGS";
+            		LDFLAGS="$thedir/*.lo $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.
diff --git a/configure.ac b/configure.ac
index e1a004c20..992e80d62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,11 +496,11 @@ if test x_$withval != x_no; then
             fi
         done
         if test x_$found_libevent != x_yes; then
-		if test -f "$dir/event.h" -a -f "$dir/.libs/libevent.a"; 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";
-            		LDFLAGS="$thedir/.libs/*.o $LDFLAGS";
+            		LDFLAGS="$thedir/*.lo $LDFLAGS";
 		else
             		AC_MSG_ERROR([Cannot find the libevent library in $withval
 You can restart ./configure --with-libevent=no to use a builtin alternative.
diff --git a/doc/Changelog b/doc/Changelog
index f2c438470..2a5b0c231 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- made using ldns-src that is included the package more portable
 	  by linking with .lo instead of .o files in the ldns package.
 	- nicer do-ip6: yes/no documentation.
+	- nicer linking of libevent .o files.
 
 9 January 2008: Wouter
 	- fixup openssl RAND problem, when the system is not configured to