X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftsearch.m4;h=9d1a1adfd55b2d76e574493df3ab57b147d001cf;hb=a365e1e5d3afa9a9f12d38eacaade8cd8fe0020e;hp=2a458f8755036c2c9b179eefa65c2bd4d5aa77ed;hpb=f6cc762af9137f7dc92b9ad5ef97c8a05f7e129b;p=gnulib.git

diff --git a/m4/tsearch.m4 b/m4/tsearch.m4
index 2a458f875..9d1a1adfd 100644
--- a/m4/tsearch.m4
+++ b/m4/tsearch.m4
@@ -1,5 +1,5 @@
-# tsearch.m4 serial 2
-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# tsearch.m4 serial 6
+dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 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.
@@ -8,10 +8,48 @@ AC_DEFUN([gl_FUNC_TSEARCH],
 [
   AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
   AC_CHECK_FUNCS([tsearch])
-  if test $ac_cv_func_tsearch = no; then
+  if test $ac_cv_func_tsearch = yes; then
+    dnl On OpenBSD 4.0, the return value of tdelete() is incorrect.
+    AC_REQUIRE([AC_PROG_CC])
+    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+    AC_CACHE_CHECK([whether tdelete works], [gl_cv_func_tdelete_works],
+      [
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stddef.h>
+#include <search.h>
+static int
+cmp_fn (const void *a, const void *b)
+{
+  return *(const int *) a - *(const int *) b;
+}
+int
+main ()
+{
+  int result = 0;
+  int x = 0;
+  void *root = NULL;
+  if (!(tfind (&x, &root, cmp_fn) == NULL))
+    result |= 1;
+  tsearch (&x, &root, cmp_fn);
+  if (!(tfind (&x, &root, cmp_fn) != NULL))
+    result |= 2;
+  if (!(tdelete (&x, &root, cmp_fn) != NULL))
+    result |= 4;
+  return result;
+}]])], [gl_cv_func_tdelete_works=yes], [gl_cv_func_tdelete_works=no],
+            [case "$host_os" in
+               openbsd*) gl_cv_func_tdelete_works="guessing no";;
+               *)        gl_cv_func_tdelete_works="guessing yes";;
+             esac
+            ])
+      ])
+    case "$gl_cv_func_tdelete_works" in
+      *no)
+        REPLACE_TSEARCH=1
+        ;;
+    esac
+  else
     HAVE_TSEARCH=0
-    AC_LIBOBJ([tsearch])
-    gl_PREREQ_TSEARCH
   fi
 ])