libevent .lo file linking.

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

diff --git a/configure b/configure
index a5f9bfa9bf9de846b000ee2a86f6993f5c8f1c68..3e3ff5b76aa0cee10f41fcbda0fa639a3994ce76 100755 (executable)
--- 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 e1a004c20d3bdb523b535c134acebac2ebed229c..992e80d621ed1bcb2bf6d8558c4affe3500f4c19 100644 (file)
--- 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 f2c438470b47be61e8495d11c0108f3202ccb341..2a5b0c2316e344e632ec9028e641b5aa1baff183 100644 (file)
--- 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