>From e4098dbe87a69aaa6a9cac5fa2a29aa53336285b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?=
Date: Wed, 15 Dec 2010 17:24:00 +0000
Subject: [PATCH] memmem, printf, strcasestr, strstr: assume OK on uClibc
* m4/memmem.m4: Assume works when cross-compiling for uClibc.
* m4/strcasestr.m4: Likewise.
* m4/strstr.m4: Likewise.
* m4/printf.m4: Rearrange long line.
---
ChangeLog | 9 +++++++++
m4/memmem.m4 | 7 +++----
m4/printf.m4 | 6 +++---
m4/strcasestr.m4 | 12 +++++-------
m4/strstr.m4 | 12 +++++-------
5 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d3354ae..cbbbffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-15 Pádraig Brady
+
+ memmem, printf, strcasestr, strstr: Don't automatically
+ replace when cross-compiling for uClibc.
+ * m4/memmem.m4: Assume works on uClibc.
+ * m4/strcasestr.m4: Likewise.
+ * m4/strstr.m4: Likewise.
+ * m4/printf.m4: Rearrange long line.
+
2010-12-13 Pádraig Brady
read-file: Improve handling of large files
diff --git a/m4/memmem.m4 b/m4/memmem.m4
index 7df132e..1a7d05f 100644
--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -1,4 +1,4 @@
-# memmem.m4 serial 20
+# memmem.m4 serial 21
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
@@ -33,10 +33,9 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
dnl works on all other platforms, even if it is not linear.
AC_EGREP_CPP([Lucky user],
[
-#ifdef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
#include
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2))
Lucky user
#endif
#elif defined __CYGWIN__
diff --git a/m4/printf.m4 b/m4/printf.m4
index 6d1cbfe..cd679c1 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 40
+# printf.m4 serial 41
dnl Copyright (C) 2003, 2007-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,
@@ -530,8 +530,8 @@ int main ()
*-gnu*)
AC_EGREP_CPP([BZ2908], [
#include
- #ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2)) && !defined __UCLIBC__
+ #ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2))
BZ2908
#endif
#endif
diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4
index 5c4cef4..cf0abdf 100644
--- a/m4/strcasestr.m4
+++ b/m4/strcasestr.m4
@@ -1,4 +1,4 @@
-# strcasestr.m4 serial 18
+# strcasestr.m4 serial 19
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,
@@ -36,10 +36,9 @@ AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE],
dnl works on all other platforms, even if it is not linear.
AC_EGREP_CPP([Lucky user],
[
-#ifdef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
#include
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2))
Lucky user
#endif
#elif defined __CYGWIN__
@@ -109,9 +108,8 @@ static void quit (int sig) { exit (sig + 128); }
AC_EGREP_CPP([Lucky user],
[
#include
-#ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+#ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2))
Lucky user
#endif
#endif
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index d83503e..faa039c 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,4 +1,4 @@
-# strstr.m4 serial 12
+# strstr.m4 serial 13
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,
@@ -29,10 +29,9 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
dnl works on all other platforms, even if it is not linear.
AC_EGREP_CPP([Lucky user],
[
-#ifdef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
#include
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2))
Lucky user
#endif
#elif defined __CYGWIN__
@@ -97,9 +96,8 @@ static void quit (int sig) { exit (sig + 128); }
AC_EGREP_CPP([Lucky user],
[
#include
-#ifdef __GNU_LIBRARY__
- #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
- && !defined __UCLIBC__
+#ifdef __GNU_LIBRARY__ && !defined __UCLIBC__
+ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2))
Lucky user
#endif
#endif
--
1.7.3.2