diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
| commit | 1b2aa7959c86a835491c8cfca8c0683b747c1855 (patch) | |
| tree | 9a0ba58647a2d57115f5c003ca4673e7693c950a /openssl/vendor/current/crypto/opensslconf.h | |
| parent | 084adb601f2d375395c6cdcedf8af91f1065fe4e (diff) | |
Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d
svn path=/openssl/vendor/current/CHANGES; revision=375
Diffstat (limited to 'openssl/vendor/current/crypto/opensslconf.h')
| -rw-r--r-- | openssl/vendor/current/crypto/opensslconf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/vendor/current/crypto/opensslconf.h b/openssl/vendor/current/crypto/opensslconf.h index 3cf32b3f..91f14d80 100644 --- a/openssl/vendor/current/crypto/opensslconf.h +++ b/openssl/vendor/current/crypto/opensslconf.h @@ -4,6 +4,9 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA +#endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif @@ -27,6 +30,9 @@ who haven't had the time to do the appropriate changes in their applications. */ #ifdef OPENSSL_ALGORITHM_DEFINES +# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) +# define NO_CAMELLIA +# endif # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif |