You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2011/12/15 00:00:48 UTC
svn commit: r1214530 - in /apr/apr-util/branches/1.5.x: ./ build/crypto.m4 configure.in

Author: minfrin
Date: Wed Dec 14 23:00:48 2011
New Revision: 1214530

URL: http://svn.apache.org/viewvc?rev=1214530&view=rev
Log:
Backport:
apr_crypto: Crypto library detection runs twice (from main configure logic
as well as from APU_CHECK_CRYPTO). Crypto enablement depends on enablement
of a crypto library, but forgetting to enable a crypto library silently
proceeds without failing.
Submitted by: trawick

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/build/crypto.m4
    apr/apr-util/branches/1.5.x/configure.in

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 23:00:48 2011
@@ -1,4 +1,4 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648,1128838,1129433,1133587,1207704,1210524,1211987
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516
 /apr/apr-util/branches/1.3.x:896410,1154885
 /apr/apr-util/branches/1.4.x:1211211,1211330
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.5.x/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/crypto.m4?rev=1214530&r1=1214529&r2=1214530&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/crypto.m4 Wed Dec 14 23:00:48 2011
@@ -34,6 +34,9 @@ AC_DEFUN([APU_CHECK_CRYPTO], [
       APU_CHECK_CRYPTO_OPENSSL
       APU_CHECK_CRYPTO_NSS
       dnl add checks for other varieties of ssl here
+      if test "$apu_have_crypto" == "0"; then
+        AC_ERROR(Crypto was requested but no crypto library was enabled)
+      fi
     fi
   ], [
       apu_have_crypto=0

Modified: apr/apr-util/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/configure.in?rev=1214530&r1=1214529&r2=1214530&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/configure.in (original)
+++ apr/apr-util/branches/1.5.x/configure.in Wed Dec 14 23:00:48 2011
@@ -151,8 +151,6 @@ dnl Determine what DBM backend type to u
 dnl Find Expat
 dnl Find an iconv library
 APU_CHECK_CRYPTO
-APU_CHECK_CRYPTO_OPENSSL
-APU_CHECK_CRYPTO_NSS
 APU_FIND_LDAP
 APU_CHECK_DBM
 APU_CHECK_DBD