]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
set ldflags during levent test.
authorWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 15 Jan 2008 12:54:11 +0000 (12:54 +0000)
committerWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 15 Jan 2008 12:54:11 +0000 (12:54 +0000)
git-svn-id: file:///svn/unbound/trunk@855 be551aaa-1e26-0410-a405-d3ace91eadb9

configure
configure.ac

index bf246692280d34354acf5b9254ed08eef0b2d7c5..59778e4204c313f428b443be09d998b2594991e0 100755 (executable)
--- 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
index b380fc112f8aee1ae3ea7f0ecbaaa4bc7863e6a0..b175e45e4f848437fcb73a2bdfa369fb2f9e78ad 100644 (file)
@@ -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