[ldns-users] ldns 1.6.0 fails to compile with --without-ssl

[Paul Wouters]

On Sat, 11 Jul 2009, Paul Wouters wrote:

> higher.c:18:25: error: openssl/ssl.h: No such file or directory
> higher.c:19:25: error: openssl/sha.h: No such file or directory
>
> There are a few more of these. The attached patch should fix those.

Now attached for real.

> I also get the following warnings/errors;

Please ignore the rest of my bug reports. Operator error. ldns compiles
with without ssl using the attached patch.

Paul
-------------- next part --------------
diff -Naur ldns-1.6.0.org/examples/ldns-nsec3-hash.c ldns-1.6.0/examples/ldns-nsec3-hash.c
--- ldns-1.6.0.org/examples/ldns-nsec3-hash.c	2009-07-11 00:09:45.000000000 -0400
+++ ldns-1.6.0/examples/ldns-nsec3-hash.c	2009-07-11 00:10:13.000000000 -0400
@@ -16,8 +16,10 @@
 #include <ldns/ldns.h>
 #include <ldns/keys.h>
 
+#ifdef HAVE_SSL
 #include <openssl/conf.h>
 #include <openssl/engine.h>
+#endif
 
 
 #define MAX_FILENAME_LEN 250
diff -Naur ldns-1.6.0.org/examples/ldns-revoke.c ldns-1.6.0/examples/ldns-revoke.c
--- ldns-1.6.0.org/examples/ldns-revoke.c	2009-07-11 00:10:07.000000000 -0400
+++ ldns-1.6.0/examples/ldns-revoke.c	2009-07-11 00:10:13.000000000 -0400
@@ -8,7 +8,9 @@
 #include "config.h"
 
 #include <ldns/ldns.h>
+#ifdef HAVE_SSL
 #include <openssl/ssl.h>
+#endif
 
 #include <errno.h>
 
diff -Naur ldns-1.6.0.org/higher.c ldns-1.6.0/higher.c
--- ldns-1.6.0.org/higher.c	2007-08-09 05:03:41.000000000 -0400
+++ ldns-1.6.0/higher.c	2009-07-11 00:11:55.000000000 -0400
@@ -15,8 +15,10 @@
 
 #include <ldns/ldns.h>
 
+#ifdef HAVE_SSL
 #include <openssl/ssl.h>
 #include <openssl/sha.h>
+#endif