Ensure wchar.h is replaced when needed.

diff --git a/ChangeLog b/ChangeLog
index dc16a03f26bede8d5ef6fa04cf74920d70678a06..e9eebfe6392ea3f5fb03f22b1b261d9315b8935e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Bruno Haible  <bruno@clisp.org>
+
+       * m4/mbsinit.m4 (gl_FUNC_MBSINIT): Invoke gl_REPLACE_WCHAR_H.
+       * m4/btowc.m4 (gl_FUNC_BTOWC): Likewise.
+
 2008-12-18  Simon Josefsson  <simon@josefsson.org>
 
        * lib/flock.c: Use proper #if symbol in check.  Reported by "Tom

diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 98849d65a1b53ab010f4da5c2953c59ccfa36922..a53694acd64503453417a7f10ace2bdac1eec28a 100644 (file)
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,4 +1,4 @@
-# btowc.m4 serial 1
+# btowc.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,7 @@ AC_DEFUN([gl_FUNC_BTOWC],
   AC_CHECK_FUNCS_ONCE([btowc])
   if test $ac_cv_func_btowc = no; then
     HAVE_BTOWC=0
+    gl_REPLACE_WCHAR_H
     AC_LIBOBJ([btowc])
     gl_PREREQ_BTOWC
   fi

diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index 8c9542a29fee3503da179bfb7b7ff540c3ff69c6..d7d54754129c9f78285d7d35272b401baee4e377 100644 (file)
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,4 +1,4 @@
-# mbsinit.m4 serial 1
+# mbsinit.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,7 @@ AC_DEFUN([gl_FUNC_MBSINIT],
   AC_CHECK_FUNCS_ONCE([mbsinit])
   if test $ac_cv_func_mbsinit = no; then
     HAVE_MBSINIT=0
+    gl_REPLACE_WCHAR_H
     AC_LIBOBJ([mbsinit])
     gl_PREREQ_MBSINIT
   fi