12 files changed, 12 insertions, 11 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index 8ec6022d69..7f4b4d01f8 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -28,6 +28,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(librpc/dcerpc.pc)
 AC_CONFIG_FILES(librpc/ndr.pc)
 AC_CONFIG_FILES(lib/torture/torture.pc)
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 8ba5af91a8..db70830295 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -54,3 +54,5 @@ swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o
 $(eval $(call python_py_module_template,samba/events.py,$(libeventssrcdir)/events.py))
 
 $(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
+
+PC_FILES += $(libeventssrcdir)/events.pc
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 1c94e3436d..52699d968e 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -55,6 +55,7 @@
 #include "replace.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 struct event_ops_list {
 	struct event_ops_list *next, *prev;
diff --git a/source4/lib/events/events_epoll.c b/source4/lib/events/events_epoll.c
index c781bd99ae..d46d5c2bbc 100644
--- a/source4/lib/events/events_epoll.c
+++ b/source4/lib/events/events_epoll.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 #include <sys/epoll.h>
 
 struct epoll_event_context {
diff --git a/source4/lib/events/events_internal.h b/source4/lib/events/events_internal.h
index 78df98a1fe..0d0755f298 100644
--- a/source4/lib/events/events_internal.h
+++ b/source4/lib/events/events_internal.h
@@ -156,5 +156,3 @@ bool events_epoll_init(void);
 #if HAVE_LINUX_AIO
 bool events_aio_init(void);
 #endif
-
-#include "events_util.h"
diff --git a/source4/lib/events/events_select.c b/source4/lib/events/events_select.c
index 9e97d2b39f..54d32204f5 100644
--- a/source4/lib/events/events_select.c
+++ b/source4/lib/events/events_select.c
@@ -27,6 +27,7 @@
 #include "system/filesys.h"
 #include "system/select.h"
 #include "events.h"
+#include "events_util.h"
 #include "events_internal.h"
 
 struct select_event_context {
diff --git a/source4/lib/events/events_signal.c b/source4/lib/events/events_signal.c
index 5c74c47edd..80a14acc11 100644
--- a/source4/lib/events/events_signal.c
+++ b/source4/lib/events/events_signal.c
@@ -25,6 +25,7 @@
 #include "system/select.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 #define NUM_SIGNALS 64
 
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index fbf83897c8..11128d7623 100644
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -32,6 +32,7 @@
 #include "system/network.h"
 #include "system/select.h" /* needed for HAVE_EVENTS_EPOLL */
 #include "events.h"
+#include "events_util.h"
 #include "events_internal.h"
 
 struct std_event_context {
diff --git a/source4/lib/events/events_timed.c b/source4/lib/events/events_timed.c
index c81825bf92..c58c898c6d 100644
--- a/source4/lib/events/events_timed.c
+++ b/source4/lib/events/events_timed.c
@@ -27,6 +27,7 @@
 #include "system/select.h"
 #include "events.h"
 #include "events_internal.h"
+#include "events_util.h"
 
 /**
   compare two timeval structures. 
diff --git a/source4/lib/ldb/ldb.i b/source4/lib/ldb/ldb.i
index db2fcdeb5b..4b61ddba5b 100644
--- a/source4/lib/ldb/ldb.i
+++ b/source4/lib/ldb/ldb.i
@@ -36,10 +36,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "talloc.h"
+#include "events.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"
-#include "events.h"
 
 typedef struct ldb_message ldb_msg;
 typedef struct ldb_context ldb;
diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c
index 8614dc7ed8..f9dd8471c7 100644
--- a/source4/lib/ldb/ldb_wrap.c
+++ b/source4/lib/ldb/ldb_wrap.c
@@ -2546,10 +2546,10 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
 #include <stdint.h>
 #include <stdbool.h>
 #include "talloc.h"
+#include "events.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "ldb_private.h"
-#include "events.h"
 
 typedef struct ldb_message ldb_msg;
 typedef struct ldb_context ldb;
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 77f4862f8a..b3dc984593 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -706,13 +706,7 @@ nogroup:x:65534:nobody
 	if (defined($ENV{VALGRIND_PROVISION})) {
 		push (@provision_options, "valgrind");
 	}
-	if (defined($ENV{PROVISION_EJS})) {
-		push (@provision_options, "$self->{bindir}/smbscript");
-		push (@provision_options, "$self->{setupdir}/provision.js");
-	} else {
-#		push (@provision_options, "$self->{bindir}/smbpython");
-		push (@provision_options, "$self->{setupdir}/provision");
-	}
+	push (@provision_options, "$self->{setupdir}/provision");
 	push (@provision_options, split(' ', $configuration));
 	push (@provision_options, "--host-name=$netbiosname");
 	push (@provision_options, "--host-ip=$ifaceipv4");