gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated (dde2466a -> a44c8f33


From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated (dde2466a -> a44c8f33)
Date: Tue, 28 Feb 2017 13:40:09 +0100

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from dde2466a make sure TSEARCH macro is found
     new e462a501 autotools macros: make sure that newer local macro will not 
break creating 'configure'
     new a44c8f33 configure.ac: fixed detection of tsearch-related functions 
and header. Precompiler macro HAVE_SEARCH_H is used by code and must be 
appropriately defined.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac               | 12 ++++++++++--
 m4/tsearch.m4              |  2 +-
 src/microhttpd/Makefile.am |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e236bf04..d1ce5d42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,8 +701,16 @@ AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h time.h 
sys/mman.h sys/ioctl.h
   inttypes.h stddef.h unistd.h \
   sockLib.h inetLib.h net/if.h], [], [], [AC_INCLUDES_DEFAULT])
 
-FUNC_TSEARCH
-AM_CONDITIONAL([HAVE_TSEARCH], [test "x$HAVE_TSEARCH" = "x1"])
+AC_CHECK_HEADER([[search.h]],
+  [
+   gl_FUNC_TSEARCH
+   AS_IF([[test "x$HAVE_TSEARCH" = "x1" && test "x$REPLACE_TSEARCH" != "x1"]],
+     [AC_DEFINE([[HAVE_SEARCH_H]], [[1]],
+       [Define to 1 if you have the <search.h> header file and your system 
have properly functioning tsearch(), tfind() and tdelete() functions])])
+  ],
+  [], [AC_INCLUDES_DEFAULT])
+
+AM_CONDITIONAL([MHD_HAVE_TSEARCH], [[test "x$ac_cv_header_search_h" = xyes && 
test "x$HAVE_TSEARCH" = "x1" && test "x$REPLACE_TSEARCH" != "x1"]])
 
 # Check for generic functions
 AC_CHECK_FUNCS([rand random])
diff --git a/m4/tsearch.m4 b/m4/tsearch.m4
index e311a633..24b35ce2 100644
--- a/m4/tsearch.m4
+++ b/m4/tsearch.m4
@@ -4,7 +4,7 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([FUNC_TSEARCH],
+AC_DEFUN([gl_FUNC_TSEARCH],
 [
   AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
   AC_CHECK_FUNCS([tsearch])
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 9bf5acea..7573fa7a 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -110,7 +110,7 @@ if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
 
-if !HAVE_TSEARCH
+if !MHD_HAVE_TSEARCH
 libmicrohttpd_la_SOURCES += \
   tsearch.c tsearch.h
 endif

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]