X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fctype.m4;h=4a86ba94ac26fc23b2db3fd92aa1d4fadbceb316;hb=7b7e379f77e9591d8f66739884084b530e4600cd;hp=c23b0e37cbccda94778368f1045d769d02b3e851;hpb=cbd5934b1918d73022d1d1d9904112f3d6d7f187;p=gnulib.git

diff --git a/m4/ctype.m4 b/m4/ctype.m4
index c23b0e37c..4a86ba94a 100644
--- a/m4/ctype.m4
+++ b/m4/ctype.m4
@@ -1,5 +1,5 @@
-# ctype_h.m4 serial 3
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# ctype_h.m4 serial 6
+dnl Copyright (C) 2009-2011 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.
@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_CTYPE_H],
 [
   AC_REQUIRE([gl_CTYPE_H_DEFAULTS])
-  dnl Execute this unconditionally, because CTYPE_H may be set by other
-  dnl modules, after this code is executed.
-  gl_CHECK_NEXT_HEADERS([ctype.h])
+
+  dnl <ctype.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_NEXT_HEADERS([ctype.h])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
@@ -21,7 +21,7 @@ AC_DEFUN([gl_CTYPE_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_CTYPE_H_DEFAULTS])
-  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
 ])
 
 AC_DEFUN([gl_CTYPE_H_DEFAULTS],