Move APU_HAVE_CRYPTO from private apu_config.h to public apu.h.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@693436 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 18 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index 8cc032f1..cd2aef1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.0
 
+  *) Move APU_HAVE_CRYPTO from private apu_config.h to public apu.h.
+     [Ruediger Pluem, Graham Leggett]
+
   *) Add apr_crypto implementations for OpenSSL and Mozilla NSS. Add a unit
      test to verify the interoperability of the two modules. Builds default
      to disabled unless explicitly enabled.
diff --git a/build/crypto.m4 b/build/crypto.m4
index 18725185..711d079c 100644
--- a/build/crypto.m4
+++ b/build/crypto.m4
@@ -39,9 +39,7 @@ AC_DEFUN([APU_CHECK_CRYPTO], [
       apu_have_crypto=0
   ])
 
-  if test "$apu_have_crypto" = "1"; then
-    AC_DEFINE([APU_HAVE_CRYPTO], 1, [Define that we have crypto capability])
-  fi
+  AC_SUBST(apu_have_crypto)
 
 ])
 dnl
@@ -108,7 +106,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
   if test "$apu_have_openssl" = "1"; then
     LDADD_crypto_openssl="$openssl_LDFLAGS -lssl -lcrypto"
     apu_have_crypto=1
-    AC_DEFINE([APU_HAVE_CRYPTO], 1, [Define that we have crypto capability])
 
     AC_MSG_CHECKING([for const input buffers in OpenSSL])
     AC_TRY_COMPILE([#include <openssl/rsa.h>],
@@ -129,6 +126,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
 
   fi  
   AC_SUBST(LDADD_crypto_openssl)
+  AC_SUBST(apu_have_crypto)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
@@ -194,9 +192,9 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [
   if test "$apu_have_nss" = "1"; then
     LDADD_crypto_nss="$nss_LDFLAGS -lnspr4 -lnss3"
     apu_have_crypto=1
-    AC_DEFINE([APU_HAVE_CRYPTO], 1, [Define that we have crypto capability])
   fi
   AC_SUBST(LDADD_crypto_nss)
+  AC_SUBST(apu_have_crypto)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
diff --git a/include/apr_crypto.h b/include/apr_crypto.h
index 0831c02d..c8b7f6a9 100644
--- a/include/apr_crypto.h
+++ b/include/apr_crypto.h
@@ -20,7 +20,6 @@
 #include "apu.h"
 #include "apr_pools.h"
 #include "apr_tables.h"
-#include "apu_config.h"
 #include "apu_errno.h"
 
 #ifdef __cplusplus
diff --git a/include/apu.h.in b/include/apu.h.in
index 64c6c18b..4037094d 100644
--- a/include/apu.h.in
+++ b/include/apu.h.in
@@ -102,6 +102,10 @@
 #define APU_HAVE_FREETDS       @apu_have_freetds@
 #define APU_HAVE_ODBC          @apu_have_odbc@
 
+#define APU_HAVE_CRYPTO        @apu_have_crypto@
+#define APU_HAVE_OPENSSL       @apu_have_openssl@
+#define APU_HAVE_NSS           @apu_have_nss@
+
 #define APU_HAVE_APR_ICONV     @have_apr_iconv@
 #define APU_HAVE_ICONV         @have_iconv@
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
diff --git a/include/apu.hnw b/include/apu.hnw
index 38e0ec61..f61eba75 100644
--- a/include/apu.hnw
+++ b/include/apu.hnw
@@ -107,6 +107,10 @@
 #define APU_HAVE_ODBC           0
 #endif
 
+#define APU_HAVE_CRYPTO         0
+#define APU_HAVE_OPENSSL        0
+#define APU_HAVE_NSS            0
+
 #define APU_HAVE_APR_ICONV      0
 #define APU_HAVE_ICONV          1
 #define APR_HAS_XLATE           (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
diff --git a/include/apu.hw b/include/apu.hw
index 90e03653..b0b0b3ca 100644
--- a/include/apu.hw
+++ b/include/apu.hw
@@ -119,6 +119,10 @@
 /* Windows always has ODBC */
 #define APU_HAVE_ODBC           1
 
+#define APU_HAVE_CRYPTO         0
+#define APU_HAVE_OPENSSL        0
+#define APU_HAVE_NSS            0
+
 #define APU_HAVE_APR_ICONV      1
 #define APU_HAVE_ICONV          0
 #define APR_HAS_XLATE           (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)