diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-24 23:01:36 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-24 23:01:36 +0000 |
| commit | b0b7b1c5aed3d44ac4e3270ad622357ccabdaa82 (patch) | |
| tree | ca3c4037fd829b500a3c9306189c1c7196d7910f /crypto | |
| parent | 462ba4f6b60853223003951211e207c71cdb73c1 (diff) | |
New Configure option --openssldir to replace ssldir.pl.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cryptlib.h | 22 | ||||
| -rw-r--r-- | crypto/opensslconf.h.in | 4 |
2 files changed, 9 insertions, 17 deletions
diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h index 8671bea9ff..990411eb42 100644 --- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -66,29 +66,17 @@ extern "C" { #endif -/* #ifdef FLAT_INC */ - #include <openssl/e_os.h> #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/err.h> +#include <openssl/opensslconf.h> -/* -#else - -#include "../e_os.h" -#include <openssl/crypto.h> -#include "buffer/buffer.h" -#include "bio/bio.h" -#include "err/err.h" -#endif -*/ - -#define X509_CERT_AREA "/usr/local/ssl" -#define X509_CERT_DIR "/usr/local/ssl/certs" -#define X509_CERT_FILE "/usr/local/ssl/cert.pem" -#define X509_PRIVATE_DIR "/usr/local/ssl/private" +#define X509_CERT_AREA OPENSSLDIR +#define X509_CERT_DIR OPENSSLDIR "/certs" +#define X509_CERT_FILE OPENSSLDIR "/cert.pem" +#define X509_PRIVATE_DIR OPENSSLDIR "/private" #define X509_CERT_DIR_EVP "SSL_CERT_DIR" #define X509_CERT_FILE_EVP "SSL_CERT_FILE" diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in index c8585133ec..f5e6c92f28 100644 --- a/crypto/opensslconf.h.in +++ b/crypto/opensslconf.h.in @@ -1,6 +1,10 @@ /* crypto/opensslconf.h */ /* WARNING: This file is autogenerated by Configure */ +#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#define OPENSSLDIR "/usr/local/ssl" +#endif + #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int #endif |