mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-24 00:29:58 -05:00
more portable libtool linking of included ldns package.
git-svn-id: file:///svn/unbound/trunk@835 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
1f47306af9
commit
1a4d24816b
4 changed files with 6 additions and 4 deletions
2
configure
vendored
2
configure
vendored
|
|
@ -24531,7 +24531,7 @@ echo "(cd $ldnsdir; ./configure)"
|
||||||
{ echo "$as_me:$LINENO: Finished $ldnsdir configure" >&5
|
{ echo "$as_me:$LINENO: Finished $ldnsdir configure" >&5
|
||||||
echo "$as_me: Finished $ldnsdir configure" >&6;}
|
echo "$as_me: Finished $ldnsdir configure" >&6;}
|
||||||
CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
|
CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
|
||||||
LDFLAGS="$LDFLAGS $ldnsdir/lib/*.o"
|
LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define HAVE_INET_ATON 1
|
#define HAVE_INET_ATON 1
|
||||||
|
|
|
||||||
|
|
@ -605,7 +605,7 @@ echo "(cd $ldnsdir; ./configure)"
|
||||||
(cd $ldnsdir; ./configure)
|
(cd $ldnsdir; ./configure)
|
||||||
AC_MSG_NOTICE([Finished $ldnsdir configure])
|
AC_MSG_NOTICE([Finished $ldnsdir configure])
|
||||||
CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
|
CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
|
||||||
LDFLAGS="$LDFLAGS $ldnsdir/lib/*.o"
|
LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
|
||||||
AC_SUBST(ldnsdir)
|
AC_SUBST(ldnsdir)
|
||||||
dnl use ldns compat functions
|
dnl use ldns compat functions
|
||||||
AC_DEFINE(HAVE_INET_ATON)
|
AC_DEFINE(HAVE_INET_ATON)
|
||||||
|
|
|
||||||
|
|
@ -79,14 +79,14 @@ struct acl_list {
|
||||||
struct acl_addr {
|
struct acl_addr {
|
||||||
/** redblacktree node, key is this structure: addr and addrlen, net */
|
/** redblacktree node, key is this structure: addr and addrlen, net */
|
||||||
rbnode_t node;
|
rbnode_t node;
|
||||||
|
/** parent node in acl tree that encompasses this entry */
|
||||||
|
struct acl_addr* parent;
|
||||||
/** address */
|
/** address */
|
||||||
struct sockaddr_storage addr;
|
struct sockaddr_storage addr;
|
||||||
/** length of addr */
|
/** length of addr */
|
||||||
socklen_t addrlen;
|
socklen_t addrlen;
|
||||||
/** netblock size */
|
/** netblock size */
|
||||||
int net;
|
int net;
|
||||||
/** parent node in acl tree that encompasses this entry */
|
|
||||||
struct acl_addr* parent;
|
|
||||||
/** access control on this netblock */
|
/** access control on this netblock */
|
||||||
enum acl_access control;
|
enum acl_access control;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
10 January 2008: Wouter
|
10 January 2008: Wouter
|
||||||
- typo in example.conf.
|
- 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
|
9 January 2008: Wouter
|
||||||
- fixup openssl RAND problem, when the system is not configured to
|
- fixup openssl RAND problem, when the system is not configured to
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue