upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ignore 1.2.2 if installed, use ldns builtin.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1087 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-05-19 20:23:45 +00:00
parent 0d3ecd25df
commit 0f56fd3042
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -24235,9 +24235,9 @@ if test "${with_ldns+set}" = set; then
fi fi
{ echo "$as_me:$LINENO: checking for ldns_rr_new in -lldns" >&5 { echo "$as_me:$LINENO: checking for ldns_buffer_copy in -lldns" >&5
echo $ECHO_N "checking for ldns_rr_new in -lldns... $ECHO_C" >&6; } echo $ECHO_N "checking for ldns_buffer_copy in -lldns... $ECHO_C" >&6; }
if test "${ac_cv_lib_ldns_ldns_rr_new+set}" = set; then if test "${ac_cv_lib_ldns_ldns_buffer_copy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -24255,11 +24255,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char ldns_rr_new (); char ldns_buffer_copy ();
int int
main () main ()
{ {
return ldns_rr_new (); return ldns_buffer_copy ();
; ;
return 0; return 0;
} }
@ -24282,21 +24282,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err test ! -s conftest.err
} && test -s conftest$ac_exeext && } && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then $as_test_x conftest$ac_exeext; then
ac_cv_lib_ldns_ldns_rr_new=yes ac_cv_lib_ldns_ldns_buffer_copy=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ldns_ldns_rr_new=no ac_cv_lib_ldns_ldns_buffer_copy=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldns_ldns_rr_new" >&5 { echo "$as_me:$LINENO: result: $ac_cv_lib_ldns_ldns_buffer_copy" >&5
echo "${ECHO_T}$ac_cv_lib_ldns_ldns_rr_new" >&6; } echo "${ECHO_T}$ac_cv_lib_ldns_ldns_buffer_copy" >&6; }
if test $ac_cv_lib_ldns_ldns_rr_new = yes; then if test $ac_cv_lib_ldns_ldns_buffer_copy = yes; then
{ echo "$as_me:$LINENO: checking for ldns_rr_free in -lldns" >&5 { echo "$as_me:$LINENO: checking for ldns_rr_free in -lldns" >&5
@ -25108,7 +25108,7 @@ echo "(cd $ldnsdir && ./configure)"
(cd $ldnsdir && ./configure) (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="-I$ldnsdir/include $CPPFLAGS"
LDFLAGS="$LDFLAGS $ldnsdir/*.lo" LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF

4
configure.ac
View file

@ -662,7 +662,7 @@ AC_ARG_WITH(ldns,
AC_SUBST(ldnsdir) AC_SUBST(ldnsdir)
]) ])
AC_CHECK_LIB(ldns, ldns_rr_new, [ AC_CHECK_LIB(ldns, ldns_buffer_copy, [
dnl ldns was found, check compat functions dnl ldns was found, check compat functions
AC_CHECK_LIB(ldns, [ldns_rr_free]) AC_CHECK_LIB(ldns, [ldns_rr_free])
AC_REPLACE_FUNCS(inet_aton) AC_REPLACE_FUNCS(inet_aton)
@ -695,7 +695,7 @@ AC_MSG_NOTICE([Configure $ldnsdir])
echo "(cd $ldnsdir && ./configure)" 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="-I$ldnsdir/include $CPPFLAGS"
LDFLAGS="$LDFLAGS $ldnsdir/*.lo" LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
AC_SUBST(ldnsdir) AC_SUBST(ldnsdir)
dnl use ldns compat functions dnl use ldns compat functions

1
doc/Changelog
View file

@ -1,6 +1,7 @@
19 May 2008: Wouter 19 May 2008: Wouter
- fedora 9, check in6_pktinfo define in configure. - fedora 9, check in6_pktinfo define in configure.
- CREDITS fixup of history. - CREDITS fixup of history.
- ignore ldns-1.2.2 if installed, use builtin 1.3.0-pre alternative.
16 May 2008: Wouter 16 May 2008: Wouter
- fixup for MacOSX hosts file reading (reported by John Dickinson). - fixup for MacOSX hosts file reading (reported by John Dickinson).