From cfc53c2c376af565f1589086d173f45ecedf8cd0 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 7 Oct 2010 07:51:31 -0600 Subject: [PATCH] cygwin: use more robust version check * m4/memmem.m4 (gl_FUNC_MEMMEM_SIMPLE, gl_FUNC_MEMMEM): Don't exclude an eventual cygwin 1.9.1. * m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE, gl_FUNC_STRSTR): Likewise. * m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE) (gl_FUNC_STRCASESTR): Likewise. Reported by Bruno Haible. Signed-off-by: Eric Blake --- ChangeLog | 10 ++++++++++ m4/memmem.m4 | 6 +++--- m4/strcasestr.m4 | 6 +++--- m4/strstr.m4 | 6 +++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 643cc441b..7257a90ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-10-07 Eric Blake + + cygwin: use more robust version check + * m4/memmem.m4 (gl_FUNC_MEMMEM_SIMPLE, gl_FUNC_MEMMEM): Don't + exclude an eventual cygwin 1.9.1. + * m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE, gl_FUNC_STRSTR): Likewise. + * m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE) + (gl_FUNC_STRCASESTR): Likewise. + Reported by Bruno Haible. + 2010-10-06 Bruno Haible string, sys_select: Avoid #including large headers unless necessary. diff --git a/m4/memmem.m4 b/m4/memmem.m4 index 553a81ced..fbaa7fb32 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,4 +1,4 @@ -# memmem.m4 serial 16 +# memmem.m4 serial 17 dnl Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE], #endif #elif defined __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #else @@ -104,7 +104,7 @@ static void quit (int sig) { exit (sig + 128); } #endif #ifdef __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #endif diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4 index f0c4a6eae..d17105e6c 100644 --- a/m4/strcasestr.m4 +++ b/m4/strcasestr.m4 @@ -1,4 +1,4 @@ -# strcasestr.m4 serial 15 +# strcasestr.m4 serial 16 dnl Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,7 +43,7 @@ AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE], #endif #elif defined __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #else @@ -112,7 +112,7 @@ static void quit (int sig) { exit (sig + 128); } #endif #ifdef __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #endif diff --git a/m4/strstr.m4 b/m4/strstr.m4 index 1880150d0..d7f33f273 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 9 +# strstr.m4 serial 10 dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,7 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], #endif #elif defined __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #else @@ -100,7 +100,7 @@ static void quit (int sig) { exit (sig + 128); } #endif #ifdef __CYGWIN__ #include - #if CYGWIN_VERSION_DLL_MAJOR >= 1007 && CYGWIN_VERSION_DLL_MINOR > 7 + #if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7) Lucky user #endif #endif -- 2.11.0