From bb2495e569fb161b42efd633eb1c471b8222b1fb Mon Sep 17 00:00:00 2001
From: Ivo Timmermans <ivo@lychnis.net>
Date: Wed, 15 Nov 2000 01:06:13 +0000
Subject: [PATCH] Use the HAVE_OPENSSL_xxx_H defined from m4/openssl.m4 during
 configure.

---
 src/connlist.h | 17 ++++++++++++++---
 src/meta.c     |  9 +++++++--
 src/net.c      | 23 +++++++++++++++++++----
 src/protocol.c | 23 +++++++++++++++++++----
 src/tincd.c    | 25 +++++++++++++++++++++----
 5 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/src/connlist.h b/src/connlist.h
index 2d66289a..8f933bca 100644
--- a/src/connlist.h
+++ b/src/connlist.h
@@ -17,14 +17,25 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connlist.h,v 1.1.2.12 2000/11/04 20:44:26 guus Exp $
+    $Id: connlist.h,v 1.1.2.13 2000/11/15 01:06:10 zarq Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
 #define __TINC_CONNLIST_H__
 
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
+#include "config.h"
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
 
 #include "net.h"
 #include "conf.h"
diff --git a/src/meta.c b/src/meta.c
index da090629..eb005fdf 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.9 2000/11/04 20:44:26 guus Exp $
+    $Id: meta.c,v 1.1.2.10 2000/11/15 01:06:10 zarq Exp $
 */
 
 #include "config.h"
@@ -27,10 +27,15 @@
 #include <syslog.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
-#include <openssl/evp.h>
 #include <unistd.h>
 #include <string.h>
 
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
 #include "net.h"
 #include "system.h"
 #include "protocol.h"
diff --git a/src/net.c b/src/net.c
index 0a23212b..0e0bddf4 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.70 2000/11/08 17:56:34 guus Exp $
+    $Id: net.c,v 1.35.4.71 2000/11/15 01:06:10 zarq Exp $
 */
 
 #include "config.h"
@@ -39,9 +39,24 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_ERR_H
+# include <openssl/err.h>
+#else
+# include <err.h>
+#endif
 
 #ifdef HAVE_TUNTAP
 #include LINUX_IF_TUN_H
diff --git a/src/protocol.c b/src/protocol.c
index 361820bd..fbb0abf3 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.59 2000/11/07 22:02:14 guus Exp $
+    $Id: protocol.c,v 1.28.4.60 2000/11/15 01:06:11 zarq Exp $
 */
 
 #include "config.h"
@@ -36,9 +36,24 @@
 
 #include <netinet/in.h>
 
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
+#ifdef HAVE_OPENSSL_SHA_H
+# include <openssl/sha.h>
+#else
+# include <sha.h>
+#endif
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
 
 #include "conf.h"
 #include "net.h"
diff --git a/src/tincd.c b/src/tincd.c
index ea2d3a7a..9c337f88 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.27 2000/11/08 20:52:37 guus Exp $
+    $Id: tincd.c,v 1.10.4.28 2000/11/15 01:06:13 zarq Exp $
 */
 
 #include "config.h"
@@ -31,9 +31,6 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <signal.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/err.h>
 #include <string.h>
 #include <termios.h>
 
@@ -41,6 +38,26 @@
 # include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
+
+#ifdef HAVE_OPENSSL_ERR_H
+# include <openssl/err.h>
+#else
+# include <err.h>
+#endif
+
+
+
 #include <pidfile.h>
 #include <utils.h>
 #include <xalloc.h>
-- 
2.39.5