Revision

162

Author

robert@fledge.watson.org

Date

2009-11-15 15:34:07 -0800 (Sun, 15 Nov 2009)

Log Message

If there's no obvious sys/event.h, implying native kqueue support, use
pkg-config to see if libkqueue can provide kqueue support.

Submitted by:	Mark Heily <mark@heily.com>

Modified Paths

• trunk/configure.ac
• trunk/src/Makefile.am

Diff

--- trunk/configure.ac	2009-11-15 21:55:02 UTC (rev 161)
+++ trunk/configure.ac	2009-11-15 23:34:07 UTC (rev 162)
@@ -136,10 +136,16 @@
 # Find libraries we will need
 #
 AC_SEARCH_LIBS(clock_gettime, rt)
-AC_SEARCH_LIBS(kqueue, kqueue)
 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)]
+)
+
+#
 # Checks for header files.
 #
 AC_HEADER_STDC

--- trunk/src/Makefile.am	2009-11-15 21:55:02 UTC (rev 161)
+++ trunk/src/Makefile.am	2009-11-15 23:34:07 UTC (rev 162)
@@ -25,15 +25,15 @@
 INCLUDES=-I$(top_builddir) -I$(top_srcdir) \
 	@APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@
 
-libdispatch_la_CFLAGS+=$(MARCH_FLAGS) $(CBLOCKS_FLAGS)
+libdispatch_la_CFLAGS+=$(MARCH_FLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS)
 
 if USE_LEGACY_API
 libdispatch_la_SOURCES+=	\
 	legacy.c
 endif
 
-libdispatch_la_LIBADD=libshims.la
-libdispatch_la_DEPENDENCIES=libshims.la
+libdispatch_la_LIBADD=libshims.la $(KQUEUE_LIBS)
+libdispatch_la_DEPENDENCIES=libshims.la $(KQUEUE_LIBS)
 
 if USE_MIG
 libdispatch_la_SOURCES+=	\