projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refresh patches
[gnulib.git]
/
m4
/
strcasestr.m4
diff --git
a/m4/strcasestr.m4
b/m4/strcasestr.m4
index
5c4cef4
..
8681a6a
100644
(file)
--- a/
m4/strcasestr.m4
+++ b/
m4/strcasestr.m4
@@
-1,5
+1,5
@@
-# strcasestr.m4 serial
18
-dnl Copyright (C) 2005, 2007
, 2008, 2009, 2010
Free Software Foundation, Inc.
+# strcasestr.m4 serial
21
+dnl Copyright (C) 2005, 2007
-2013
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.
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.
@@
-32,14
+32,17
@@
AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE],
]])],
[gl_cv_func_strcasestr_works_always=yes],
[gl_cv_func_strcasestr_works_always=no],
]])],
[gl_cv_func_strcasestr_works_always=yes],
[gl_cv_func_strcasestr_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 strcasestr
+ dnl than 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)) \
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__
Lucky user
#endif
#elif defined __CYGWIN__
@@
-51,20
+54,18
@@
AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE],
Lucky user
#endif
],
Lucky user
#endif
],
- [gl_cv_func_strcasestr_works_always=
yes
],
+ [gl_cv_func_strcasestr_works_always=
"guessing yes"
],
[gl_cv_func_strcasestr_works_always="guessing no"])
])
])
[gl_cv_func_strcasestr_works_always="guessing no"])
])
])
- if test "$gl_cv_func_strcasestr_works_always" != yes; then
- REPLACE_STRCASESTR=1
- AC_LIBOBJ([strcasestr])
- fi
+ case "$gl_cv_func_strcasestr_works_always" in
+ *yes) ;;
+ *)
+ REPLACE_STRCASESTR=1
+ ;;
+ esac
fi
fi
fi
fi
- if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
- AC_LIBOBJ([strcasestr])
- gl_PREREQ_STRCASESTR
- fi
]) # gl_FUNC_STRCASESTR_SIMPLE
dnl Additionally, check that strcasestr is efficient.
]) # gl_FUNC_STRCASESTR_SIMPLE
dnl Additionally, check that strcasestr is efficient.
@@
-122,15
+123,16
@@
static void quit (int sig) { exit (sig + 128); }
#endif
#endif
],
#endif
#endif
],
- [gl_cv_func_strcasestr_linear=
yes
],
+ [gl_cv_func_strcasestr_linear=
"guessing yes"
],
[gl_cv_func_strcasestr_linear="guessing no"])
])
])
[gl_cv_func_strcasestr_linear="guessing no"])
])
])
- if test "$gl_cv_func_strcasestr_linear" != yes; then
- REPLACE_STRCASESTR=1
- AC_LIBOBJ([strcasestr])
- gl_PREREQ_STRCASESTR
- fi
+ case "$gl_cv_func_strcasestr_linear" in
+ *yes) ;;
+ *)
+ REPLACE_STRCASESTR=1
+ ;;
+ esac
fi
]) # gl_FUNC_STRCASESTR
fi
]) # gl_FUNC_STRCASESTR