From b0b7b1c5aed3d44ac4e3270ad622357ccabdaa82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulf=20M=C3=B6ller?= <ulf@openssl.org>
Date: Sat, 24 Apr 1999 23:01:36 +0000
Subject: New Configure option --openssldir to replace ssldir.pl.

---
 crypto/cryptlib.h | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'crypto/cryptlib.h')

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"
-- 
cgit v1.2.3