X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fctype.m4;h=07d8e5e5a5f026716b34d8c21410fdb1f0442a87;hb=682a983ba6ec26161cf2b5c2d71830cf2928ad26;hp=51e5333f608afd48698f500b11d040e74e66eb82;hpb=0d976c6e8c8b73a72565449a59adee827a57e1b7;p=gnulib.git

diff --git a/m4/ctype.m4 b/m4/ctype.m4
index 51e5333f6..07d8e5e5a 100644
--- a/m4/ctype.m4
+++ b/m4/ctype.m4
@@ -1,5 +1,5 @@
-# ctype_h.m4 serial 1
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
+# ctype_h.m4 serial 5
+dnl Copyright (C) 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,
 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.
+
+  dnl <ctype.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_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],
@@ -24,5 +29,4 @@ AC_DEFUN([gl_CTYPE_H_DEFAULTS],
   GNULIB_ISBLANK=0; AC_SUBST([GNULIB_ISBLANK])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_ISBLANK=1;   AC_SUBST([HAVE_ISBLANK])
-  CTYPE_H='';       AC_SUBST([CTYPE_H])
 ])