Re: [PATCH] Re: wctype.h and wchar.h inclusion

[Derek Price]

Paul Eggert wrote:

>Derek Price <address@hidden> writes:
>
>  
>
>><http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00055.html>. 
>>    
>>
>
>Bruno doesn't like AC_LIBSOURCES so I doubt whether he'll accept that
>part of the patch.  Surely you need only the AC_CHECK_HEADERS_ONCE and
>the AC_LIBOBJ part?
>  
>

No, actually.  mbchar.c needs to at least be removed from lib_SOURCES,
or else it gets compiled, which is what causes the problem in the first
place, but the attached, revised patch should work.

2005-09-20  Yoann Vandoorselaere  <address@hidden>
            Derek Price  <address@hidden>

    * m4/mbchar.m4 (gl_MBCHAR): Check for wchar.h & wctype.h, compiling
    mbchar.c only when present.
    * modules/mbchar (lib_SOURCES): Remove mbchar.c.

Regards,

Derek

-- 
Derek R. Price
CVS Solutions Architect
Ximbiot <http://ximbiot.com>
v: +1 717.579.6168
f: +1 717.234.3125
<mailto:address@hidden>

Index: m4/mbchar.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mbchar.m4,v
retrieving revision 1.1
diff -u -p -r1.1 mbchar.m4
--- m4/mbchar.m4        16 Aug 2005 12:06:55 -0000      1.1
+++ m4/mbchar.m4        20 Sep 2005 18:14:51 -0000
@@ -9,6 +9,13 @@ dnl From Bruno Haible.
 
 AC_DEFUN([gl_MBCHAR],
 [
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+
+  if test x$ac_cv_header_wchar_h = xyes \
+     && test x$ac_cv_header_wctype_h = xyes; then
+    AC_LIBOBJ(mbchar)
+  fi
+
   AC_REQUIRE([AC_GNU_SOURCE])
   :
 ])
Index: modules/mbchar
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mbchar,v
retrieving revision 1.1
diff -u -p -r1.1 mbchar
--- modules/mbchar      16 Aug 2005 12:06:55 -0000      1.1
+++ modules/mbchar      20 Sep 2005 18:14:51 -0000
@@ -13,7 +13,7 @@ configure.ac:
 gl_MBCHAR
 
 Makefile.am:
-lib_SOURCES += mbchar.h mbchar.c
+lib_SOURCES += mbchar.h
 
 Include:
 "mbchar.h"