* acgeneral.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS): Include

strings.h if usable with string.h.
Suggested by Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index d3dd325f5a2b2ef5e9e6c3ed24b883a9a824715a..03f7b7c8a11c08c23b8806b16f000be7f98ada11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-04  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS): Include
+       strings.h if usable with string.h.
+       Suggested by Paul Eggert.
+
 2001-07-04  Akim Demaille  <akim@epita.fr>
 
        * autoscan.in (&scan_file): Skip FILE if there is FILE.in.

diff --git a/NEWS b/NEWS
index 574fc1c65c57aeef27ae3987b55f1b79b6c6d1af..85da314aab60a2a762062be50b5c3de6323aa71a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@
 ** Default includes
 - Now include stdint.h.
 - sys/types.h and sys/stat.h are guarded.
+- strings.h is included if available, and not conflicting with string.h.
 
 ** Bug fixes
 - The test suite is more robust and presents less false failures.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 5277605052c169a6dcb93fbc0b48c82c1544fc5f..024d8337a42872e9958b9f0c3126286edfc2bd25 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2820,10 +2820,9 @@ Most generic macros provide the following default set of includes:
 #  include <memory.h>
 # endif
 # include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
@@ -2839,8 +2838,14 @@ Most generic macros provide the following default set of includes:
 @end example
 
 If the default includes are used, then Autoconf will automatically check
-for the presence of these headers, i.e., you don't need to run
-@code{AC_HEADERS_STDC}, nor check for @file{stdlib.h} etc.
+for the presence of these headers and their compatibility, i.e., you
+don't need to run @code{AC_HEADERS_STDC}, nor check for @file{stdlib.h}
+etc.
+
+These headers are checked for in the same order as they are included.
+For instance, on some systems @file{string.h} and @file{strings.h} both
+exist, but conflict.  Then @code{HAVE_STRING_H} will be defined, but
+@code{HAVE_STRINGS_H} won't.
 
 @node Alternative Programs, Libraries, Common Behavior, Existing Tests
 @section Alternative Programs