more portable libtool linking of included ldns package.

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

diff --git a/configure b/configure
index 90c9460970ce69dc5a0eb1b0a887204587949a17..a5f9bfa9bf9de846b000ee2a86f6993f5c8f1c68 100755 (executable)
--- a/configure
+++ b/configure
@@ -24531,7 +24531,7 @@ echo "(cd $ldnsdir; ./configure)"
 { echo "$as_me:$LINENO: Finished $ldnsdir configure" >&5
 echo "$as_me: Finished $ldnsdir configure" >&6;}
 CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
-LDFLAGS="$LDFLAGS $ldnsdir/lib/*.o"
+LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_INET_ATON 1

diff --git a/configure.ac b/configure.ac
index 97d96fe220b25c4b28b834163746ce0bb39bdd55..e1a004c20d3bdb523b535c134acebac2ebed229c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -605,7 +605,7 @@ echo "(cd $ldnsdir; ./configure)"
 (cd $ldnsdir; ./configure)
 AC_MSG_NOTICE([Finished $ldnsdir configure])
 CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
-LDFLAGS="$LDFLAGS $ldnsdir/lib/*.o"
+LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
 AC_SUBST(ldnsdir)
 dnl use ldns compat functions
 AC_DEFINE(HAVE_INET_ATON)

diff --git a/daemon/acl_list.h b/daemon/acl_list.h
index 1edf8996f8933e1b050be84d350c59b739b684c0..704b5b2ac527bac1689de2e8d8a0b5f9576ae0fd 100644 (file)
--- a/daemon/acl_list.h
+++ b/daemon/acl_list.h
@@ -79,14 +79,14 @@ struct acl_list {
 struct acl_addr {
        /** redblacktree node, key is this structure: addr and addrlen, net */
        rbnode_t node;
+       /** parent node in acl tree that encompasses this entry */
+       struct acl_addr* parent;
        /** address */
        struct sockaddr_storage addr;
        /** length of addr */
        socklen_t addrlen;
        /** netblock size */
        int net;
-       /** parent node in acl tree that encompasses this entry */
-       struct acl_addr* parent;
        /** access control on this netblock */
        enum acl_access control;
 };

diff --git a/doc/Changelog b/doc/Changelog
index 765338e4962904b0e5927de775d48cac17ade441..a0b93b1ac441da1901a5e70fbf0ab88ba4303826 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 10 January 2008: Wouter
        - typo in example.conf.
+       - made using ldns-src that is included the package more portable
+         by linking with .lo instead of .o files in the ldns package.
 
 9 January 2008: Wouter
        - fixup openssl RAND problem, when the system is not configured to