apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r693436 - in /apr/apr-util/trunk: CHANGES build/crypto.m4 include/apr_crypto.h include/apu.h.in include/apu.hnw include/apu.hw
Date Tue, 09 Sep 2008 11:16:57 GMT
Author: minfrin
Date: Tue Sep  9 04:16:56 2008
New Revision: 693436

URL: http://svn.apache.org/viewvc?rev=693436&view=rev
Log:
Move APU_HAVE_CRYPTO from private apu_config.h to public apu.h.

Modified:
    apr/apr-util/trunk/CHANGES
    apr/apr-util/trunk/build/crypto.m4
    apr/apr-util/trunk/include/apr_crypto.h
    apr/apr-util/trunk/include/apu.h.in
    apr/apr-util/trunk/include/apu.hnw
    apr/apr-util/trunk/include/apu.hw

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Tue Sep  9 04:16:56 2008
@@ -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.

Modified: apr/apr-util/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/crypto.m4?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/build/crypto.m4 (original)
+++ apr/apr-util/trunk/build/crypto.m4 Tue Sep  9 04:16:56 2008
@@ -39,9 +39,7 @@
       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 @@
   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 @@
 
   fi  
   AC_SUBST(LDADD_crypto_openssl)
+  AC_SUBST(apu_have_crypto)
 
   LIBS="$old_libs"
   CPPFLAGS="$old_cppflags"
@@ -194,9 +192,9 @@
   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"

Modified: apr/apr-util/trunk/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_crypto.h?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_crypto.h (original)
+++ apr/apr-util/trunk/include/apr_crypto.h Tue Sep  9 04:16:56 2008
@@ -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

Modified: apr/apr-util/trunk/include/apu.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apu.h.in?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apu.h.in (original)
+++ apr/apr-util/trunk/include/apu.h.in Tue Sep  9 04:16:56 2008
@@ -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)

Modified: apr/apr-util/trunk/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apu.hnw?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apu.hnw (original)
+++ apr/apr-util/trunk/include/apu.hnw Tue Sep  9 04:16:56 2008
@@ -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)

Modified: apr/apr-util/trunk/include/apu.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apu.hw?rev=693436&r1=693435&r2=693436&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apu.hw (original)
+++ apr/apr-util/trunk/include/apu.hw Tue Sep  9 04:16:56 2008
@@ -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)



Mime
View raw message