From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 10 Jan 2008 11:47:07 +0000 (+0000)
Subject: more portable libtool linking of included ldns package.
X-Git-Tag: release-0.9~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a4d24816befb7baa55a3db6433454e36cbd1f27;p=thirdparty%2Funbound.git

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 90c946097..a5f9bfa9b 100755
--- 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 97d96fe22..e1a004c20 100644
--- 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 1edf8996f..704b5b2ac 100644
--- 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 765338e49..a0b93b1ac 100644
--- 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