You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2012/08/08 02:02:19 UTC
svn commit: r1370598 - in /apr/apr-util/branches/1.5.x: ./ build/crypto.m4
Author: trawick
Date: Wed Aug 8 00:02:18 2012
New Revision: 1370598
URL: http://svn.apache.org/viewvc?rev=1370598&view=rev
Log:
merge r1346865 from trunk:
* build/crypto.m4: Always define apu_have_openssl, apu_have_nss to avoid
sh warning when testing these variables if modular-dso is disabled.
Modified:
apr/apr-util/branches/1.5.x/ (props changed)
apr/apr-util/branches/1.5.x/build/crypto.m4
Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1346865
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=1370598&r1=1370597&r2=1370598&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/crypto.m4 Wed Aug 8 00:02:18 2012
@@ -23,6 +23,8 @@ dnl APU_CHECK_CRYPTO: look for crypto li
dnl
AC_DEFUN([APU_CHECK_CRYPTO], [
apu_have_crypto=0
+ apu_have_openssl=0
+ apu_have_nss=0
old_libs="$LIBS"
old_cppflags="$CPPFLAGS"
@@ -48,7 +50,6 @@ AC_DEFUN([APU_CHECK_CRYPTO], [
dnl
AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
- apu_have_openssl=0
openssl_have_headers=0
openssl_have_libs=0
@@ -137,7 +138,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
])
AC_DEFUN([APU_CHECK_CRYPTO_NSS], [
- apu_have_nss=0
nss_have_headers=0
nss_have_libs=0