interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Anticipate older libldns with travis

This commit is contained in:
Willem Toorop 2015-03-18 21:43:41 +01:00
parent fa782d1043
commit 7fc18e8c35
4 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
configure vendored
View File

@ -1829,6 +1829,63 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_decl
# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
# ----------------------------------------------------
# Tries to find if the field MEMBER exists in type AGGR, after including
# INCLUDES, setting cache variable VAR accordingly.
ac_fn_c_check_member ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
$as_echo_n "checking for $2.$3... " >&6; }
if eval \${$4+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$5
int
main ()
{
static $2 ac_aggr;
if (ac_aggr.$3)
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
eval "$4=yes"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$5
int
main ()
{
static $2 ac_aggr;
if (sizeof ac_aggr.$3)
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
eval "$4=yes"
else
eval "$4=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
eval ac_res=\$$4
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_member
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
@ -11401,6 +11458,17 @@ else
fi
ac_fn_c_check_member "$LINENO" "struct ldns_struct_dnssec_zone" "hashed_names" "ac_cv_member_struct_ldns_struct_dnssec_zone_hashed_names" "#include <ldns.h>
"
if test "x$ac_cv_member_struct_ldns_struct_dnssec_zone_hashed_names" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define LDNS_DNSSEC_ZONE_HASHED_NAMES 1
_ACEOF
fi
if test $found_all_libs == 0
then
as_fn_error $? "One more dependencies is missing" "$LINENO" 5

3
configure.ac
View File

@ -220,6 +220,9 @@ AC_CHECK_LIB([ldns], [ldns_dname_new_frm_str], [], [found_all_libs=0])
AC_MSG_NOTICE([Checking for dependency libidn])
AC_CHECK_LIB([idn], [idna_to_ascii_8z], [], [found_all_libs=0])
AC_CHECK_MEMBER([struct ldns_struct_dnssec_zone.hashed_names],
[AC_DEFINE_UNQUOTED([LDNS_DNSSEC_ZONE_HASHED_NAMES], [1], [When defined ldns_dnssec_zone contained the hashed_names member.])], [], [[#include <ldns.h>]])
if test $found_all_libs == 0
then
AC_MSG_ERROR([One more dependencies is missing])

3
src/config.h.in
View File

@ -102,6 +102,9 @@
/* Define to 1 if you have the <uv.h> header file. */
#undef HAVE_UV_H
/* When defined ldns_dnssec_zone contained the hashed_names member. */
#undef LDNS_DNSSEC_ZONE_HASHED_NAMES
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR

2
src/dnssec.c
View File

@ -502,6 +502,7 @@ priv_getdns_ldns_dnssec_zone_add_rr(ldns_dnssec_zone *zone, ldns_rr *rr)
zone->names = ldns_rbtree_create(ldns_dname_compare_v);
(void)ldns_rbtree_insert(zone->names, new_node);
#ifdef LDNS_DNSSEC_ZONE_HASHED_NAMES
if (!(new_node = LDNS_MALLOC(ldns_rbnode_t))) {
ldns_dnssec_name_free(new_name);
return LDNS_STATUS_MEM_ERR;
@ -513,6 +514,7 @@ priv_getdns_ldns_dnssec_zone_add_rr(ldns_dnssec_zone *zone, ldns_rr *rr)
zone->hashed_names = ldns_rbtree_create(ldns_dname_compare_v);
}
(void)ldns_rbtree_insert(zone->hashed_names, new_node);
#endif
return ldns_dnssec_zone_add_rr(zone, rr);
}