Import upstream version 1.27

[debian/tar] / m4 / strings_h.m4

diff --git a/m4/strings_h.m4 b/m4/strings_h.m4
index 71d284b633fa1578df6d5f34b90e1bf0256952e9..76ef2424e7d6954c6b3de9affee0e49f807442b2 100644 (file)
--- a/m4/strings_h.m4
+++ b/m4/strings_h.m4
@@ -1,7 +1,7 @@
-# Configure a replacement for <string.h>.
-# serial 3
+# Configure a replacement for <strings.h>.
+# serial 6

 
 

-# Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.


@@ -16,12 +16,23 @@ AC_DEFUN([gl_HEADER_STRINGS_H],
 AC_DEFUN([gl_HEADER_STRINGS_H_BODY],
 [
   AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
 AC_DEFUN([gl_HEADER_STRINGS_H_BODY],
 [
   AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])

+

   gl_CHECK_NEXT_HEADERS([strings.h])
   gl_CHECK_NEXT_HEADERS([strings.h])

+  if test $ac_cv_header_strings_h = yes; then
+    HAVE_STRINGS_H=1
+  else
+    HAVE_STRINGS_H=0
+  fi
+  AC_SUBST([HAVE_STRINGS_H])

 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.

-  gl_WARN_ON_USE_PREPARE([[#include <strings.h>
-    ]], [strcasecmp strncasecmp])
+  gl_WARN_ON_USE_PREPARE([[
+    /* Minix 3.1.8 has a bug: <sys/types.h> must be included before
+       <strings.h>.  */
+    #include <sys/types.h>
+    #include <strings.h>
+    ]], [ffs strcasecmp strncasecmp])

 ])
 
 AC_DEFUN([gl_STRINGS_MODULE_INDICATOR],
 ])
 
 AC_DEFUN([gl_STRINGS_MODULE_INDICATOR],


@@ -33,7 +44,9 @@ AC_DEFUN([gl_STRINGS_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS],
 [
 
 AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS],
 [

+  GNULIB_FFS=0;            AC_SUBST([GNULIB_FFS])

   dnl Assume proper GNU behavior unless another module says otherwise.
   dnl Assume proper GNU behavior unless another module says otherwise.

+  HAVE_FFS=1;              AC_SUBST([HAVE_FFS])

   HAVE_STRCASECMP=1;       AC_SUBST([HAVE_STRCASECMP])
   HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP])
 ])
   HAVE_STRCASECMP=1;       AC_SUBST([HAVE_STRCASECMP])
   HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP])
 ])