diff options
| author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-14 23:02:06 +0000 |
|---|---|---|
| committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-14 23:02:06 +0000 |
| commit | c39fc08a90bd1d42967b37ed287ec786055cf9b6 (patch) | |
| tree | 01ce8e1baad6074892f4b82b4d302b68518cdca6 | |
| parent | 02d286f2201ea53af71411c9dce5076873829397 (diff) | |
| download | libapr-util-c39fc08a90bd1d42967b37ed287ec786055cf9b6.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.4.x@1214531 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/crypto.m4 | 3 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/crypto.m4 b/build/crypto.m4 index e9a65c91..89e4bade 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -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 diff --git a/configure.in b/configure.in index 3aff5132..b993cafd 100644 --- a/configure.in +++ b/configure.in @@ -151,8 +151,6 @@ dnl Determine what DBM backend type to use. 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 |