[GNUnet-SVN] r24855 - libmicrohttpd

[gnunet]

Author: grothoff
Date: 2012-11-08 22:35:38 +0100 (Thu, 08 Nov 2012)
New Revision: 24855

Modified:
   libmicrohttpd/AUTHORS
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
Log:
Ship its own version of tsearch and friends if not provided by platform.

On GNU based systems the tree related functions (tsearch, tfind, tdestroy)
are provided by the libc (with the interface specification in search.h). On
non-GNU systems this functionality may or may not be available. That's the
case for Android which ships its own, simplified, version of libc called
Bionic. Bionic does not contains neither search.h nor an implementation of
the above mentioned functions.

This patch adds detection for the presence of search.h and if the header file
is not found, it uses an internal version of search.h and functions tsearch,
tfind, and tdestroy. The internal version is based on the source code from
FreeBSD and is compiled if and only if the configure script did not find the
search.h header file.
 -- Jan Janak


Modified: libmicrohttpd/AUTHORS
===================================================================
--- libmicrohttpd/AUTHORS       2012-11-08 21:30:28 UTC (rev 24854)
+++ libmicrohttpd/AUTHORS       2012-11-08 21:35:38 UTC (rev 24855)
@@ -38,6 +38,7 @@
 Sven Geggus <address@hidden>
 Steve Wolf <address@hidden>
 Brecht Sanders <address@hidden>
+Jan Janak <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2012-11-08 21:30:28 UTC (rev 24854)
+++ libmicrohttpd/ChangeLog     2012-11-08 21:35:38 UTC (rev 24855)
@@ -1,3 +1,7 @@
+Thu Nov  8 22:32:59 CET 2012
+       Ship our own version of tsearch and friends if not provided by platform,
+       so that MHD works nicely on Android. -JJ
+
 Mon Oct 22 13:05:01 CEST 2012
        Immediately do a second read if we get a full buffer from
        TLS as there might be more data in the TLS buffers even if

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2012-11-08 21:30:28 UTC (rev 24854)
+++ libmicrohttpd/configure.ac  2012-11-08 21:35:38 UTC (rev 24855)
@@ -184,6 +184,8 @@
 # Check for optional headers
 AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h 
netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h 
winsock2.h ws2tcpip.h])
 
+AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), 
AM_CONDITIONAL(HAVE_TSEARCH, false))
+
 # Check for plibc.h from system, if not found, use our own
 AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
 AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)