commit 191bc8447a612463da8decbbd7abb97da1cd9a41
parent accd90e6c7beb22dd5c9dae2bfab4b14fa46e3be
Author: ukai <ukai>
Date: Mon, 20 Oct 2003 16:41:56 +0000
#include <openssl/...>
suggested by ABE Yuji <cbo46560@pop12.odn.ne.jp>
[w3m-dev 03998] problem about pkg-config check for OpenSSL
* html.h: #include <openssl/...>
* istream.c: ditto
* istream.h: ditto
* url.c: ditto
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-21 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * #include <openssl/...>
+ suggested by ABE Yuji <cbo46560@pop12.odn.ne.jp>
+ [w3m-dev 03998] problem about pkg-config check for OpenSSL
+ * html.h: #include <openssl/...>
+ * istream.c: ditto
+ * istream.h: ditto
+ * url.c: ditto
+
2003-10-20 ABE Yuji <cbo46560@pop12.odn.ne.jp>
* [w3m-dev 04002] Re: function and w3m-control
diff --git a/html.h b/html.h
@@ -2,9 +2,9 @@
#ifndef _HTML_H
#define _HTML_H
#ifdef USE_SSL
-#include <bio.h>
-#include <x509.h>
-#include <ssl.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
#endif /* USE_SSL */
#include "istream.h"
diff --git a/istream.c b/istream.c
@@ -4,7 +4,7 @@
#include "istream.h"
#include <signal.h>
#ifdef USE_SSL
-#include <x509v3.h>
+#include <openssl/x509v3.h>
#endif
#define uchar unsigned char
diff --git a/istream.h b/istream.h
@@ -4,9 +4,9 @@
#include <stdio.h>
#ifdef USE_SSL
-#include <bio.h>
-#include <x509.h>
-#include <ssl.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
#endif
#include "Str.h"
#include <sys/types.h>
diff --git a/url.c b/url.c
@@ -22,9 +22,9 @@
#ifdef USE_SSL
#ifndef SSLEAY_VERSION_NUMBER
-#include <crypto.h> /* SSLEAY_VERSION_NUMBER may be here */
+#include <openssl/crypto.h> /* SSLEAY_VERSION_NUMBER may be here */
#endif
-#include <err.h>
+#include <openssl/err.h>
#endif
#ifdef __WATT32__
@@ -248,7 +248,7 @@ free_ssl_ctx()
}
#if SSLEAY_VERSION_NUMBER >= 0x00905100
-#include <rand.h>
+#include <openssl/rand.h>
static void
init_PRNG()
{