diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-09-23 19:36:58 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2012-09-23 19:36:58 +0000 |
| commit | f4a60868f9921c8ba7e53bea3668ed18d49eaa93 (patch) | |
| tree | d0592991fbae7575a7416acf5f23c0967c3858be /build | |
| parent | 7e5fe0e4f20a3be840fca87c2d42cc842131cc40 (diff) | |
| download | libapr-f4a60868f9921c8ba7e53bea3668ed18d49eaa93.tar.gz | |
revert broken r1389129 for the time being
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1389131 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/crypto.m4 | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/build/crypto.m4 b/build/crypto.m4 index 2343d4834..8ed889efd 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -33,26 +33,11 @@ AC_DEFUN([APU_CHECK_CRYPTO], [ AC_ARG_WITH([crypto], [APR_HELP_STRING([--with-crypto], [enable crypto support])], [ if test "$withval" = "yes"; then - - crypto_library_enabled=0 - for cryptolib in openssl nss; do - eval v=\$with_$cryptolib - if test "$v" != "" -a "$v" != "no"; then - crypto_library_enabled=1 - fi - done - - if test "$crypto_library_enabled" = "0"; then - AC_MSG_NOTICE(Crypto was requested but no crypto library was found; autodetecting available libraries) - with_openssl=yes - with_nss=yes - fi - 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 found; specify the location of a crypto library using --with-openssl, --with-nss, etc.) + AC_ERROR(Crypto was requested but no crypto library was enabled) fi fi ], [ |