From 1f4ca1445d142de72160d3741b8038fc7299d38e Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Tue, 26 Dec 2023 15:53:22 +0100
Subject: [PATCH] [libevent] include event2/event.h instead of event.h

---
 config2.h.in      | 4 ++--
 configure.ac      | 4 ++--
 meson.build       | 8 ++++----
 src/main/select.c | 6 +++---
 src/main/select.h | 8 +++++---
 src/main/timer.c  | 6 +++---
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/config2.h.in b/config2.h.in
index 41f2552a..e880ad54 100644
--- a/config2.h.in
+++ b/config2.h.in
@@ -373,8 +373,8 @@
 /* Define to 1 if you have the `event_get_version' function. */
 #mesondefine HAVE_EVENT_GET_VERSION
 
-/* Define to 1 if you have the <event.h> header file. */
-#mesondefine HAVE_EVENT_H
+/* Define to 1 if you have the <event2/event.h> header file. */
+#mesondefine HAVE_EVENT2_EVENT_H
 
 /* Define to 1 if you have the `event_reinit' function. */
 #mesondefine HAVE_EVENT_REINIT
diff --git a/configure.ac b/configure.ac
index 3356f01a..071e0aa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1499,8 +1499,8 @@ AC_ARG_WITH(libevent, [  --with-libevent         compile with libevent. Note tha
 CONFIG_LIBEVENT=no
 cf_have_libevent=no
 if test "$enable_libevent" = yes -a "$cf_have_libev" = no; then
-	AC_CHECK_HEADERS(event.h ev-event.h)
-	if test "$ac_cv_header_event_h" = yes; then
+	AC_CHECK_HEADERS(event2/event.h ev-event.h)
+	if test "$ac_cv_header_event2_event_h" = yes; then
 		AC_CHECK_LIB(event, event_loop)
 		if test "$ac_cv_lib_event_event_loop" = yes; then
 			cf_have_libevent=yes
diff --git a/meson.build b/meson.build
index 0f38a006..fe4c81c1 100644
--- a/meson.build
+++ b/meson.build
@@ -327,8 +327,8 @@ if compiler.has_header('idn2.h')
     conf_data.set('HAVE_IDN2_H', 1)
 endif
 
-if compiler.has_header('event.h')
-    conf_data.set('HAVE_EVENT_H', 1)
+if compiler.has_header('event2/event.h')
+    conf_data.set('HAVE_EVENT2_EVENT_H', 1)
 endif
 
 if compiler.has_header('alloca.h')
@@ -382,8 +382,8 @@ if conf_data.get('CONFIG_LIBEV')
     deps += eventdeps
     conf_data.set('CONFIG_LIBEVENT', false)
 elif conf_data.get('CONFIG_LIBEVENT')
-    eh = '#include <event.h>'
-    eventdeps = dependency('libevent', static: st)
+    eh = '#include <event2/event.h>'
+    eventdeps = dependency('libevent', static: st, version: '>=2.0.0')
     deps += eventdeps
     conf_data.set('HAVE_LIBEVENT', true)
 else
diff --git a/src/main/select.c b/src/main/select.c
index 3acb01d0..44fa6e56 100644
--- a/src/main/select.c
+++ b/src/main/select.c
@@ -37,9 +37,9 @@
 #define USE_LIBEVENT
 #endif
 
-#if (defined(HAVE_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
-#if defined(HAVE_EVENT_H)
-#include <event.h>
+#if (defined(HAVE_EVENT2_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
+#if defined(HAVE_EVENT2_EVENT_H)
+#include <event2/event.h>
 #elif defined(HAVE_EV_EVENT_H)
 #include <ev-event.h>
 #endif
diff --git a/src/main/select.h b/src/main/select.h
index 3aa1d197..e7ef45dc 100644
--- a/src/main/select.h
+++ b/src/main/select.h
@@ -10,9 +10,11 @@
 #define USE_LIBEVENT
 #endif
 
-#if (defined(HAVE_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
-#if defined(HAVE_EVENT_H)
-#include <event.h>
+#if (defined(HAVE_EVENT2_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
+#if defined(HAVE_EVENT2_EVENT_H)
+#include <event2/event.h>
+#include <event2/event_compat.h>
+#include <event2/event_struct.h>
 #elif defined(HAVE_EV_EVENT_H)
 #include <ev-event.h>
 #endif
diff --git a/src/main/timer.c b/src/main/timer.c
index d2cafd31..8ac7ddb6 100644
--- a/src/main/timer.c
+++ b/src/main/timer.c
@@ -15,9 +15,9 @@
 #define USE_LIBEVENT
 #endif
 
-#if (defined(HAVE_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
-#if defined(HAVE_EVENT_H)
-#include <event.h>
+#if (defined(HAVE_EVENT2_EVENT_H) || defined(HAVE_EV_EVENT_H) || defined(HAVE_LIBEV_EVENT_H)) && defined(HAVE_LIBEVENT) && !defined(OPENVMS) && !defined(DOS)
+#if defined(HAVE_DEVENT2_EVENT_H)
+#include <event2/event.h>
 #elif defined(HAVE_EV_EVENT_H)
 #include <ev-event.h>
 #endif