Merge pull request #15 from gonzalolarralde/master

Add option to provide Bionic Libc (Android) support

Author: mheily

Makefile.am

@@ -35,7 +35,9 @@ libkqueue_la_SOURCES = \
        src/common/tree.h \
        src/linux/platform.h
 
+if !BIONIC_LIBC
 libkqueue_la_LIBADD = -lpthread -lrt
+endif
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libkqueue.pc
@@ -58,6 +60,10 @@ kqtest_SOURCES = \
 
 kqtest_CFLAGS = -g -O0 -Wall -Werror -I$(top_srcdir)/include -I$(top_srcdir)/test -I$(builddir)
 
+if BIONIC_LIBC
+kqtest_LDADD = -lpthread
+else
 kqtest_LDADD = -lpthread -lrt libkqueue.la
+endif
 
 

configure.ac

@@ -16,6 +16,14 @@ AC_ARG_ENABLE([libkqueue-install],
 )
 AM_CONDITIONAL([INSTALL],[test "x$enable_libkqueue_install" != "xno"])
 
+# Add option to provide Bionic Libc (Android) support
+AC_ARG_ENABLE([bionic-libc],
+  [AS_HELP_STRING([--enable-bionic-libc],
+    [Build for Bionic Libc (Android)])],,
+  [enable_bionic_libc=yes]
+)
+AM_CONDITIONAL(BIONIC_LIBC, [test "x$enable_bionic_libc" == "xyes"])
+
 AC_CHECK_HEADER([sys/event.h])
 AC_CHECK_DECL([EPOLLRDHUP], [], [], [[#include <sys/epoll.h>]])
 AC_CHECK_DECL([ppoll], [], [], [[