ignore 1.2.2 if installed, use ldns builtin.

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

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

diff --git a/configure.ac b/configure.ac
index 33f92265a70b85c02515cb9a0f23b6e9b81534e1..fa226706d3b54bc27bcf1d3cb2a2fcf845676ed3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -662,7 +662,7 @@ AC_ARG_WITH(ldns,
        AC_SUBST(ldnsdir)
 ])
 
-AC_CHECK_LIB(ldns, ldns_rr_new, [
+AC_CHECK_LIB(ldns, ldns_buffer_copy, [
 dnl ldns was found, check compat functions
 AC_CHECK_LIB(ldns, [ldns_rr_free])
 AC_REPLACE_FUNCS(inet_aton)
@@ -695,7 +695,7 @@ AC_MSG_NOTICE([Configure $ldnsdir])
 echo "(cd $ldnsdir && ./configure)"
 (cd $ldnsdir && ./configure)
 AC_MSG_NOTICE([Finished $ldnsdir configure])
-CPPFLAGS="$CPPFLAGS -I$ldnsdir/include"
+CPPFLAGS="-I$ldnsdir/include $CPPFLAGS"
 LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
 AC_SUBST(ldnsdir)
 dnl use ldns compat functions

diff --git a/doc/Changelog b/doc/Changelog
index 4034889ea7009c8be2cc8c47b0acf0990d0f9972..5b3aebc8870ad94cca5d7737e94595edc9395195 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 19 May 2008: Wouter
        - fedora 9, check in6_pktinfo define in configure.
        - CREDITS fixup of history.
+       - ignore ldns-1.2.2 if installed, use builtin 1.3.0-pre alternative.
 
 16 May 2008: Wouter
        - fixup for MacOSX hosts file reading (reported by John Dickinson).