Eric Blake <[EMAIL PROTECTED]> writes:
> The obvious solution (I hope) - only use one of the two substitution methods.
But the rest of wctype_.h uses the @...@ substitution method; this is
the tradition for .h files that might get installed into an environment
that doesn't have config.h.
I installed this further patch deal with this issue more consistently;
I think it should solve the original problem.
2007-01-10 Paul Eggert <[EMAIL PROTECTED]>
Use @...@ consistently in lib/wctype_.h.
* lib/wctype_.h [HAVE_WINT_T]: Go back to using @...@, but rely
on it being set to 1 or 0.
* m4/wctype.m4 (gl_WCTYPE_H): Set HAVE_WINT_T to 1 or 0, and
go back to AC_SUBSTing it.
* modules/wctype (Makefile.am): Undo previous change.
Index: lib/wctype_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/wctype_.h,v
retrieving revision 1.7
diff -u -p -r1.7 wctype_.h
--- lib/wctype_.h 10 Jan 2007 18:25:49 -0000 1.7
+++ lib/wctype_.h 10 Jan 2007 22:24:48 -0000
@@ -29,7 +29,7 @@
#ifndef _GL_WCTYPE_H
#define _GL_WCTYPE_H
-#if HAVE_WINT_T - 0
+#if @HAVE_WINT_T@
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
<wchar.h>.
Index: m4/wctype.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/wctype.m4,v
retrieving revision 1.7
diff -u -p -r1.7 wctype.m4
--- m4/wctype.m4 10 Jan 2007 18:25:49 -0000 1.7
+++ m4/wctype.m4 10 Jan 2007 22:24:48 -0000
@@ -7,8 +7,6 @@ dnl with or without modifications, as lo
dnl Written by Paul Eggert.
-# wctype.m4 serial 2
-
AC_DEFUN([gl_WCTYPE_H],
[
AC_CHECK_FUNCS_ONCE([iswcntrl])
@@ -16,6 +14,12 @@ AC_DEFUN([gl_WCTYPE_H],
AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([gt_TYPE_WINT_T])
+ if test $gt_cv_c_wint_t = yes; then
+ HAVE_WINT_T=1
+ else
+ HAVE_WINT_T=0
+ fi
+ AC_SUBST([HAVE_WINT_T])
WCTYPE_H=wctype.h
if test $ac_cv_header_wctype_h = yes; then
Index: modules/wctype
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/wctype,v
retrieving revision 1.4
diff -u -p -r1.4 wctype
--- modules/wctype 10 Jan 2007 18:25:49 -0000 1.4
+++ modules/wctype 10 Jan 2007 22:24:48 -0000
@@ -23,6 +23,7 @@ wctype.h: wctype_.h
sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
-e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \
+ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
< $(srcdir)/wctype_.h; \
} > [EMAIL PROTECTED]
mv [EMAIL PROTECTED] $@
