fix missing ev.h for curvedns build

indimail · Oct 3, 2024 · 20a88ab · 20a88ab
1 parent b3ff529
commit 20a88ab
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/tinydnssec-x/curvedns-0.88/Makefile.am b/tinydnssec-x/curvedns-0.88/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 CDNSCFLAGS=-Wall -fno-strict-aliasing -O3 $(CPPFLAGS)
 
-DEFS=$(CFLAGS) -g -m64 -O3 -fomit-frame-pointer -funroll-loops $(CDNSCFLAGS) $(EVCFLAGS)
+DEFS=@DEFS@ $(CFLAGS) -g -m64 -O3 -fomit-frame-pointer -funroll-loops $(CDNSCFLAGS) $(EVCFLAGS)
 
 bin_PROGRAMS = curvedns
 sbin_PROGRAMS = curvedns-keygen

diff --git a/tinydnssec-x/curvedns-0.88/cache_hashtable.h b/tinydnssec-x/curvedns-0.88/cache_hashtable.h
@@ -42,7 +42,15 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <ev.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef EV_HEADER
+#include EV_HEADER			/* libev */
+#else
+#include <ev.h>				/* libev */
+#endif
 #include "crypto_box_curve25519xsalsa20poly1305.h"
 #include "debug.h"
 

diff --git a/tinydnssec-x/curvedns-0.88/configure.ac b/tinydnssec-x/curvedns-0.88/configure.ac
@@ -73,6 +73,22 @@ esac
 # Checks for libraries.
 AC_CHECK_LIB(ev, ev_io_start, [AC_SUBST([LIB_EV], ["-lev"]) AC_DEFINE([HAVE_LIBEV], [1],[libevent])],,-lev)
 AC_CHECK_LIB(sodium, crypto_box_curve25519xsalsa20poly1305_beforenm, [AC_SUBST([LIB_SODIUM], ["-lsodium"]) AC_DEFINE([HAVE_LIBSODIUM], [1],[sodium library])],,-lsodium)
+evdir=""
+for f in /usr/include /usr/local/include /opt/local/include
+do
+	if test -f $f/ev.h
+	then
+		break
+	fi
+	if test -f $f/libev/ev.h
+	then
+		evdir="libev"
+	fi
+done
+if test -n "$evdir"
+then
+	AC_DEFINE_UNQUOTED(EV_HEADER, "$evdir/ev.h", libev directory)
+fi
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/tinydnssec-x/curvedns-0.88/event.h b/tinydnssec-x/curvedns-0.88/event.h
@@ -42,7 +42,15 @@
 #include <stdint.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef EV_HEADER
+#include EV_HEADER			/* libev */
+#else
 #include <ev.h>
+#endif
 #include "ip.h"
 #include "cache_hashtable.h"
 

diff --git a/tinydnssec-x/curvedns-0.88/ip.h b/tinydnssec-x/curvedns-0.88/ip.h
@@ -51,7 +51,15 @@
 #include <fcntl.h>			/* fcntl() */
 #include <netdb.h>			/* getaddrinfo() */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef EV_HEADER
+#include EV_HEADER			/* libev */
+#else
 #include <ev.h>				/* libev */
+#endif
 
 typedef union {
 	struct sockaddr sa;