apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1370604 - in /apr/apr-util/branches/1.4.x: ./ build/crypto.m4
Date Wed, 08 Aug 2012 00:08:56 GMT
Author: trawick
Date: Wed Aug  8 00:08:56 2012
New Revision: 1370604

URL: http://svn.apache.org/viewvc?rev=1370604&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.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/build/crypto.m4

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1346865

Modified: apr/apr-util/branches/1.4.x/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/crypto.m4?rev=1370604&r1=1370603&r2=1370604&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/crypto.m4 Wed Aug  8 00:08:56 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
 



Mime
View raw message