configure: fixed checks for tsearch() and related

New check works correctly with new compilers.
Added known problematic implementations.
Added more checks for correct behaviour.
Removed some m4 macros.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a0f71779..33bfd034 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -156,7 +156,7 @@ if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
 
-if !MHD_HAVE_TSEARCH
+if !MHD_USE_SYS_TSEARCH
 libmicrohttpd2_la_SOURCES += \
   tsearch.c tsearch.h
 endif
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 8e6e623a..36ad802f 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -153,7 +153,7 @@ if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
 
-if !MHD_HAVE_TSEARCH
+if !MHD_USE_SYS_TSEARCH
 libmicrohttpd_la_SOURCES += \
   tsearch.c tsearch.h
 endif
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index c9c0d51c..5e9be378 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -47,11 +47,11 @@
 #include "mhd_align.h"
 #include "mhd_str.h"
 
-#ifdef HAVE_SEARCH_H
+#ifdef MHD_USE_SYS_TSEARCH
 #include <search.h>
-#else
+#else  /* ! MHD_USE_SYS_TSEARCH */
 #include "tsearch.h"
-#endif
+#endif /* ! MHD_USE_SYS_TSEARCH */
 
 #ifdef HTTPS_SUPPORT
 #include "connection_https.h"