X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fctype.m4;h=100bd3a744940dfad320efef2e1eb5bd8b70418d;hb=da8054d48dc22e1c051db54049e005d51a006e69;hp=f366113744cf83c155154dddda4f4bce8b5f0382;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/ctype.m4 b/m4/ctype.m4
index f36611374..100bd3a74 100644
--- a/m4/ctype.m4
+++ b/m4/ctype.m4
@@ -1,5 +1,5 @@
-# ctype_h.m4 serial 2
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# ctype_h.m4 serial 6
+dnl Copyright (C) 2009-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.
@@ -7,16 +7,21 @@ 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.
+  gl_WARN_ON_USE_PREPARE([[#include <ctype.h>
+    ]], [isblank])
 ])
 
 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],