Merge pull request #76 from ianpartridge/experimental/foundation

libkqueue as git submodule

Author: seabaylea

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libpwq"]
 	path = libpwq
 	url = https://github.com/mheily/libpwq.git
+[submodule "libkqueue"]
+	path = libkqueue
+	url = https://github.com/ianpartridge/libkqueue.git

INSTALL

@@ -109,7 +109,7 @@ Prepare your system
  2. Install dtrace (to generate provider.h)
     sudo apt-get install systemtap-sdt-dev
  3. Install libdispatch pre-reqs
-    sudo apt-get install libblocksruntime-dev libkqueue-dev libbsd-dev
+    sudo apt-get install libblocksruntime-dev libbsd-dev
 
 Initialize git submodules:
   We are using git submodules to incorporate a specific revision of the

Makefile.am

@@ -5,31 +5,30 @@
 ACLOCAL_AMFLAGS = -I m4
 
 if BUILD_OWN_PTHREAD_WORKQUEUES
+  MAYBE_PTHREAD_WORKQUEUES = libpwq
+endif
+
+if BUILD_OWN_KQUEUES
+  MAYBE_KQUEUES = libkqueue
+endif
+
 SUBDIRS=					\
 	dispatch				\
-	libpwq					\
-	man						\
-	os						\
-	private					\
-	src						\
-	tests
-else
-SUBDIRS=					\
-	dispatch				\
-	man						\
-	os						\
+	$(MAYBE_PTHREAD_WORKQUEUES)		\
+	$(MAYBE_KQUEUES)			\
+	man					\
+	os					\
 	private					\
-	src						\
+	src					\
 	tests
-endif
 
 EXTRA_DIST=					\
 	README.md				\
 	LICENSE					\
 	PATCHES					\
 	autogen.sh				\
-	config/config.h			\
-	libdispatch.xcodeproj	\
+	config/config.h				\
+	libdispatch.xcodeproj			\
 	resolver				\
 	tools					\
 	xcodeconfig				\

configure.ac

@@ -150,12 +150,20 @@ esac
 AC_SEARCH_LIBS(clock_gettime, rt)
 AC_SEARCH_LIBS(pthread_create, pthread)
 
-#
-# Prefer native kqueue(2); otherwise use libkqueue if present.
-#
-AC_CHECK_HEADER(sys/event.h, [],
-  [PKG_CHECK_MODULES(KQUEUE, libkqueue)]
+AS_IF([test -f $srcdir/libkqueue/configure.ac],
+  [AC_DEFINE(BUILD_OWN_KQUEUES, 1, [Define if building libkqueue from source])
+   ac_configure_args="--disable-libkqueue-install $ac_configure_args"
+   AC_CONFIG_SUBDIRS([libkqueue])
+   build_own_kqueues=true],
+  [build_own_kqueues=false
+   AC_CHECK_HEADER(sys/event.h, [],
+     [AC_SEARCH_LIBS([kqueue], [kqueue], [],
+       [AC_MSG_ERROR([unable to find kqueue() function])]
+     )]
+   )
+  ]
 )
+AM_CONDITIONAL(BUILD_OWN_KQUEUES, $build_own_kqueues)
 
 AC_CHECK_FUNCS([strlcpy getprogname], [],
   [PKG_CHECK_MODULES(BSD_OVERLAY, libbsd-overlay,[

libkqueue

@@ -59,12 +59,19 @@ AM_CPPFLAGS=-I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_srcdir)/private -I$(top_srcdir)/os
 
 DISPATCH_CFLAGS=-Wall $(VISIBILITY_FLAGS) $(OMIT_LEAF_FP_FLAGS) \
-	$(MARCH_FLAGS) $(KQUEUE_CFLAGS) $(BSD_OVERLAY_CFLAGS)
-AM_CFLAGS= $(PTHREAD_WORKQUEUE_CFLAGS) $(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
+	$(MARCH_FLAGS) $(BSD_OVERLAY_CFLAGS)
+AM_CFLAGS=$(KQUEUE_CFLAGS) $(PTHREAD_WORKQUEUE_CFLAGS) $(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
 AM_OBJCFLAGS=$(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
-AM_CXXFLAGS=$(PTHREAD_WORKQUEUE_CFLAGS) $(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
+AM_CXXFLAGS=$(KQUEUE_CFLAGS) $(PTHREAD_WORKQUEUE_CFLAGS) $(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
 
+if BUILD_OWN_KQUEUES
+  KQUEUE_LIBS=$(top_builddir)/libkqueue/libkqueue.la
+  KQUEUE_CFLAGS=-I$(top_srcdir)/libkqueue/include
+else
+  KQUEUE_CFLAGS=-I/usr/local/include/kqueue
+endif
+
 if BUILD_OWN_PTHREAD_WORKQUEUES
   PTHREAD_WORKQUEUE_LIBS=$(top_builddir)/libpwq/libpthread_workqueue.la
   PTHREAD_WORKQUEUE_CFLAGS=-I$(top_srcdir)/libpwq/include

src/Makefile.am

@@ -115,6 +115,13 @@ AM_OBJCFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS)
 AM_CXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS) $(BSD_OVERLAY_CFLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
 
+if BUILD_OWN_KQUEUES
+  KQUEUE_LIBS=$(top_builddir)/libkqueue/libkqueue.la
+  KQUEUE_CFLAGS=-I$(top_srcdir)/libkqueue/include
+else
+  KQUEUE_CFLAGS=-I/usr/local/include/kqueue
+endif
+
 if !BUILD_OWN_PTHREAD_WORKQUEUES
 if HAVE_PTHREAD_WORKQUEUES
   PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue