Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
(This used to be commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4)

source4/Makefile
source4/lib/events/events.c

index 8c74b4899d8e74097544f0d9812492552ff736cd..98c45a34ad8649f281513272a34c5459ade24428 100644 (file)
@@ -24,7 +24,7 @@ $(srcdir)/version.h: $(srcdir)/VERSION
 
 .DEFAULT_GOAL := all
 
-ifneq ($(automatic_deps),yes)
+ifneq ($(automatic_dependencies),yes)
 ALL_PREDEP = proto
 .NOTPARALLEL:
 endif
index 5d43a9116117cb3cee6070d2c7b2c030e50fd675..568aadc31e1f1e6c3c2398cd8216860b950e2c07 100644 (file)
@@ -105,6 +105,7 @@ static void event_backend_init(void)
        NTSTATUS s4_events_standard_init(void);
        NTSTATUS s4_events_select_init(void);
        NTSTATUS s4_events_epoll_init(void);
+       NTSTATUS s4_events_aio_init(void);
        init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES };
        if (event_backends) return;
        run_init_functions(static_init);