From: Wouter Wijngaards Date: Fri, 11 Jul 2014 10:44:00 +0000 (+0000) Subject: No getentropy needed if arc4random available. X-Git-Tag: release-1.5.0rc1~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d87b3b139c042d0a775a68364ee25d22626c7c;p=thirdparty%2Funbound.git No getentropy needed if arc4random available. git-svn-id: file:///svn/unbound/trunk@3164 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/configure b/configure index f70082175..3e25921c1 100755 --- a/configure +++ b/configure @@ -18157,8 +18157,7 @@ esac ;; esac - fi - for ac_func in getentropy + for ac_func in getentropy do : ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy" if test "x$ac_cv_func_getentropy" = xyes; then : @@ -18257,6 +18256,7 @@ done fi done + fi fi LIBOBJ_WITHOUT_CTIME="$LIBOBJS" diff --git a/configure.ac b/configure.ac index 730758449..9c8b1ff82 100644 --- a/configure.ac +++ b/configure.ac @@ -976,8 +976,7 @@ if test "$USE_NSS" = "no"; then if test "$ac_cv_func_arc4random" = "no" -o "$ac_cv_func_arc4random_uniform" = "no"; then AC_LIBOBJ(explicit_bzero) AC_LIBOBJ(arc4_lock) - fi - AC_CHECK_FUNCS([getentropy],,[ + AC_CHECK_FUNCS([getentropy],,[ case `uname` in Darwin) AC_LIBOBJ(getentropy_osx) @@ -1000,7 +999,8 @@ if test "$USE_NSS" = "no"; then ]) ;; esac - ]) + ]) + fi fi LIBOBJ_WITHOUT_CTIME="$LIBOBJS" AC_SUBST(LIBOBJ_WITHOUT_CTIME)