From 1cfe1ed7c8c41cf0a1c8a3d5c8b22da2559759a2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Feb 2007 20:37:29 +0000
Subject: [PATCH] Undo most of the 2007-02-03 change, switching to the strcase
 module now that gnulib strcase has been fixed. * bootstrap.conf
 (gnulib_modules): Remove c-strcase.  Add strcase. * lib/.cvsignore: Remove
 c-ctype.c, c-ctype.h, c-strcase.h, c-strcasecomp.c, c-strncasecmp.c.  Add
 strcasecmp.c, strncasecmp.c * m4/.cvsignore: Add strcase.m4. * src/getargs.c:
 Revert 2007-02-03 change, as follows. Don't include c-strcase.h.
 (language_argmatch): Use strcasecmp rather than c_strcasecmp. strcasecmp has
 "unspecified behavior" outside the POSIX locale, but it works fine in
 practice if at least one argument is ASCII, as is the case in Bison.

---
 ChangeLog      | 15 +++++++++++++++
 bootstrap.conf |  5 ++---
 lib/.cvsignore |  7 ++-----
 m4/.cvsignore  |  1 +
 src/getargs.c  |  3 +--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29fa8be4..1adcebcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Undo most of the 2007-02-03 change, switching to the strcase module
+	now that gnulib strcase has been fixed.
+	* bootstrap.conf (gnulib_modules): Remove c-strcase.  Add strcase.
+	* lib/.cvsignore: Remove c-ctype.c, c-ctype.h, c-strcase.h,
+	c-strcasecomp.c, c-strncasecmp.c.  Add strcasecmp.c, strncasecmp.c
+	* m4/.cvsignore: Add strcase.m4.
+	* src/getargs.c: Revert 2007-02-03 change, as follows.
+	Don't include c-strcase.h.
+	(language_argmatch): Use strcasecmp rather than c_strcasecmp.
+	strcasecmp has "unspecified behavior" outside the POSIX locale,
+	but it works fine in practice if at least one argument is ASCII,
+	as is the case in Bison.
+
 2007-02-07  Paolo Bonzini  <bonzini@gnu.org>
 
 	* tests/java.at: Skip tests if only one of javac/java is present.
diff --git a/bootstrap.conf b/bootstrap.conf
index 1a0df2e2..9904426d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,10 +20,9 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-	argmatch config-h c-strcase configmake
-	dirname error extensions fopen-safer
+	argmatch config-h configmake dirname error extensions fopen-safer
 	getopt gettext hash inttypes javacomp-script javaexec-script malloc
-	mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
+	mbswidth obstack quote quotearg stdbool stpcpy strcase strerror strtoul
 	strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
 	xstrndup
 '
diff --git a/lib/.cvsignore b/lib/.cvsignore
index c2c86105..fa006b5e 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -4,11 +4,6 @@ Makefile.in
 argmatch.c
 argmatch.h
 basename.c
-c-ctype.c
-c-ctype.h
-c-strcase.h
-c-strcasecmp.c
-c-strncasecmp.c
 config.h
 config.hin
 configmake.h
@@ -51,10 +46,12 @@ stdint_.h
 stdio--.h
 stdio-safer.h
 stpcpy.c
+strcasecmp.c
 strerror.c
 string.h
 string_.h
 stripslash.c
+strncasecmp.c
 strndup.c
 strnlen.c
 strtol.c
diff --git a/m4/.cvsignore b/m4/.cvsignore
index ba11f3e6..68a249c5 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -38,6 +38,7 @@ stdint.m4
 stdint_h.m4
 stdio-safer.m4
 stpcpy.m4
+strcase.m4
 strerror.m4
 string_h.m4
 strndup.m4
diff --git a/src/getargs.c b/src/getargs.c
index 4ff38fb1..0938c698 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -25,7 +25,6 @@
 #include "revision.h"
 
 #include <argmatch.h>
-#include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
 
@@ -367,7 +366,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
     {
       int i;
       for (i = 0; valid_languages[i].language[0]; i++)
-	if (c_strcasecmp (arg, valid_languages[i].language) == 0)
+	if (strcasecmp (arg, valid_languages[i].language) == 0)
 	  {
 	    language_prio = prio;
 	    language = &valid_languages[i];
-- 
2.45.2