ceilf-ieee: Work around bug on MacOS X 10.5.

[pspp] / m4 / strstr.m4

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index d83503e397987559405e84391d9a29f1f9cc7a64..010bd7ffe5c370891fd6d6fd1a8b31d9c6985ac2 100644 (file)
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,5 +1,5 @@
-# strstr.m4 serial 12
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# strstr.m4 serial 14
+dnl Copyright (C) 2008-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.
@@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
   AC_REQUIRE([gl_FUNC_MEMCHR])
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
-    AC_LIBOBJ([strstr])
   else
     dnl Detect http://sourceware.org/bugzilla/show_bug.cgi?id=12092.
     AC_CACHE_CHECK([whether strstr works],
@@ -25,14 +24,17 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
     ]])],
         [gl_cv_func_strstr_works_always=yes],
         [gl_cv_func_strstr_works_always=no],
-        [dnl glibc 2.12 and cygwin 1.7.7 have a known bug.  Assume that it
-         dnl works on all other platforms, even if it is not linear.
+        [dnl glibc 2.12 and cygwin 1.7.7 have a known bug.  uClibc is not
+         dnl affected, since it uses different source code for strstr than
+         dnl glibc.
+         dnl Assume that it works on all other platforms, even if it is not
+         dnl linear.
          AC_EGREP_CPP([Lucky user],
            [
 #ifdef __GNU_LIBRARY__
  #include <features.h>
  #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
-     && !defined __UCLIBC__
+     || defined __UCLIBC__
   Lucky user
  #endif
 #elif defined __CYGWIN__
@@ -50,7 +52,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
       ])
     if test "$gl_cv_func_strstr_works_always" != yes; then
       REPLACE_STRSTR=1
-      AC_LIBOBJ([strstr])
     fi
   fi
 ]) # gl_FUNC_STRSTR_SIMPLE
@@ -118,7 +119,4 @@ static void quit (int sig) { exit (sig + 128); }
       REPLACE_STRSTR=1
     fi
   fi
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
 ]) # gl_FUNC_STRSTR