diff options
| author | Eric Blake <ebb9@byu.net> | 2008-05-15 19:55:56 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-05-15 19:55:56 -0600 |
| commit | 0ce8aa7c1dfb56c1f64dcc799a4038eac1f55e95 (patch) | |
| tree | 513b1c4a60726defe26c0eef69e8fa17606efd76 /m4/strstr.m4 | |
| parent | 6bfd4cdcc5a2cd4252a06d746d30ce9cdc7f3c0c (diff) | |
| download | gnulib-0ce8aa7c1dfb56c1f64dcc799a4038eac1f55e95.tar.gz | |
Extend previous patch to cygwin 1.7.0.
* m4/memmem.m4 (gl_FUNC_MEMMEM): When cross-compiling, assume a
fast implementation in cygwin >= 1.7.0.
* m4/strstr.m4 (gl_FUNC_STRSTR): Likewise.
* m4/strcasestr.m4 (gl_FUNC_STRCASESTR): Likewise.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'm4/strstr.m4')
| -rw-r--r-- | m4/strstr.m4 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/m4/strstr.m4 b/m4/strstr.m4 index fe01d5f49d..67b93c9f76 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 3 +# strstr.m4 serial 4 dnl Copyright (C) 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,14 +34,20 @@ AC_DEFUN([gl_FUNC_STRSTR], } return !result;]])], [gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no], - [dnl Only glibc >= 2.9 is known to have an strstr that works in - dnl linear time. - AC_EGREP_CPP([Lucky GNU user], + [dnl Only glibc >= 2.9 and cygwin >= 1.7.0 are known to have a + dnl strstr that works in linear time. + AC_EGREP_CPP([Lucky user], [ #include <features.h> #ifdef __GNU_LIBRARY__ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2) - Lucky GNU user + Lucky user + #endif +#endif +#ifdef __CYGWIN__ + #include <cygwin/version.h> + #if CYGWIN_VERSION_DLL_MAJOR >= 1007 + Lucky user #endif #endif ], |