From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 11 Mar 2010 12:52:58 +0000 (+0000)
Subject: MacPorts fix.
X-Git-Tag: release-1.4.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698b9df9de264cf32bc1c762cee312855cff9fe5;p=thirdparty%2Funbound.git

MacPorts fix.


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

diff --git a/configure b/configure
index a9f411fd6..28b93fefc 100755
--- a/configure
+++ b/configure
@@ -22905,6 +22905,92 @@ _ACEOF
 
 fi
 
+	{ $as_echo "$as_me:$LINENO: checking for ldns_key_buf2rsa_raw" >&5
+$as_echo_n "checking for ldns_key_buf2rsa_raw... " >&6; }
+if test "${ac_cv_func_ldns_key_buf2rsa_raw+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define ldns_key_buf2rsa_raw to an innocuous variant, in case <limits.h> declares ldns_key_buf2rsa_raw.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define ldns_key_buf2rsa_raw innocuous_ldns_key_buf2rsa_raw
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char ldns_key_buf2rsa_raw (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef ldns_key_buf2rsa_raw
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldns_key_buf2rsa_raw ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_ldns_key_buf2rsa_raw || defined __stub___ldns_key_buf2rsa_raw
+choke me
+#endif
+
+int
+main ()
+{
+return ldns_key_buf2rsa_raw ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_ldns_key_buf2rsa_raw=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_ldns_key_buf2rsa_raw=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldns_key_buf2rsa_raw" >&5
+$as_echo "$ac_cv_func_ldns_key_buf2rsa_raw" >&6; }
+
 
 for ac_header in ldns/ldns.h
 do
@@ -22968,6 +23054,7 @@ fi
 done
 
 	if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
+	    -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
 	    -a $ac_cv_header_ldns_ldns_h = yes; then
 	    	    { $as_echo "$as_me:$LINENO: checking for ldns_b32_ntop_extended_hex" >&5
 $as_echo_n "checking for ldns_b32_ntop_extended_hex... " >&6; }
diff --git a/configure.ac b/configure.ac
index f40bb11ff..f60947835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -608,8 +608,10 @@ AC_ARG_WITH(ldns-builtin, AC_HELP_STRING([--with-ldns-builtin],
 # check if ldns is good enough
 if test "$use_ldns_builtin" = "no"; then
 	AC_CHECK_LIB(ldns, ldns_buffer_copy)
+	AC_CHECK_FUNC(ldns_key_buf2rsa_raw)
 	AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT])
 	if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
+	    -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
 	    -a $ac_cv_header_ldns_ldns_h = yes; then
 	    dnl ldns was found, check compat functions
 	    AC_CHECK_FUNC([ldns_b32_ntop_extended_hex],, [
diff --git a/doc/Changelog b/doc/Changelog
index b13ad2d66..36535b3db 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- another memory allocation option: --enable-alloc-nonregional.
 	  exposes the regional allocations to other memory purifiers.
 	- fix for memory alignment in struct sock_list allocation.
+	- Fix for MacPorts ldns without ssl default, unbound checks if ldns
+	  has dnssec functionality and uses the builtin if not.
 
 10 March 2010: Wouter
 	- --enable-alloc-lite works with test set.