s4:lib/tevent: add lib/events/ compat and let things compile

metze

8 files changed, 18 insertions, 3 deletions

diff --git a/source4/Makefile b/source4/Makefile
index 8899cde2d2..2d49efb93b 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -67,6 +67,7 @@ libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
+libteventsrcdir := ../lib/tevent
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
 poptsrcdir := ../lib/popt
diff --git a/source4/configure.ac b/source4/configure.ac
index 53e093e813..7162081bbb 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -34,7 +34,7 @@ m4_include(../nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
-AC_CONFIG_FILES(lib/events/events.pc)
+AC_CONFIG_FILES(../lib/tevent/tevent.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(../librpc/ndr.pc)
 AC_CONFIG_FILES(../lib/torture/torture.pc)
@@ -96,7 +96,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)
-m4_include(lib/events/libevents.m4)
+m4_include(../lib/tevent/libtevent.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(auth/gensec/config.m4)
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
new file mode 100644
index 0000000000..b9d6879b3c
--- /dev/null
+++ b/source4/lib/events/config.mk
@@ -0,0 +1,7 @@
+[SUBSYSTEM::LIBEVENTS]
+PUBLIC_DEPENDENCIES = LIBTEVENT
+CFLAGS = -Ilib/events
+
+LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, events_dummy.o)
+
+PUBLIC_HEADERS += $(addprefix $(libeventssrcdir)/, events.h events_internal.h)
diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
new file mode 100644
index 0000000000..d2e81f5279
--- /dev/null
+++ b/source4/lib/events/events.h
@@ -0,0 +1 @@
+#include <tevent.h>
diff --git a/source4/lib/events/events_dummy.c b/source4/lib/events/events_dummy.c
new file mode 100644
index 0000000000..15bb25e953
--- /dev/null
+++ b/source4/lib/events/events_dummy.c
@@ -0,0 +1,4 @@
+void __events_dummy(void)
+{
+}
+
diff --git a/source4/lib/events/events_internal.h b/source4/lib/events/events_internal.h
new file mode 100644
index 0000000000..308587ce2f
--- /dev/null
+++ b/source4/lib/events/events_internal.h
@@ -0,0 +1 @@
+#include <tevent_internal.h>
diff --git a/source4/main.mk b/source4/main.mk
index 1d4ffc5d44..e54196a2f9 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -14,6 +14,7 @@ mkinclude lib/ldb-samba/config.mk
 mkinclude lib/tls/config.mk
 mkinclude lib/registry/config.mk
 mkinclude lib/messaging/config.mk
+mkinclude ../lib/tevent/config.mk
 mkinclude lib/events/config.mk
 mkinclude lib/cmdline/config.mk
 mkinclude ../lib/socket_wrapper/config.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 46d5e38e67..60cbf25eda 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -43,7 +43,7 @@ TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../../lib/util/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
 		$(torturesrcdir)/../lib/tdr/testsuite.o \
-		$(torturesrcdir)/../lib/events/testsuite.o \
+		$(torturesrcdir)/../../lib/tevent/testsuite.o \
 		$(torturesrcdir)/../param/tests/share.o \
 		$(torturesrcdir)/../param/tests/loadparm.o \
 		$(torturesrcdir)/../auth/credentials/tests/simple.o \