apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1214516 - in /apr/apr/trunk: build/crypto.m4 configure.in
Date Wed, 14 Dec 2011 22:39:34 GMT
Author: minfrin
Date: Wed Dec 14 22:39:34 2011
New Revision: 1214516

URL: http://svn.apache.org/viewvc?rev=1214516&view=rev
Log:
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/trunk/build/crypto.m4
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1214516&r1=1214515&r2=1214516&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Wed Dec 14 22:39:34 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/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1214516&r1=1214515&r2=1214516&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Wed Dec 14 22:39:34 2011
@@ -2604,8 +2604,6 @@ APU_PRELOAD
 
 dnl Find crypto libraries
 APU_CHECK_CRYPTO
-APU_CHECK_CRYPTO_OPENSSL
-APU_CHECK_CRYPTO_NSS
 
 dnl Find DBM and DBD backends to use.
 APU_CHECK_DBM



Mime
View raw message