(gui_b): Add mbrtowc checking.

Resurrect [utf8/]wchar.h checking.

diff --git a/ChangeLog b/ChangeLog
index 20893fb15fcdd3d48e8427c1b8addce613a7a8f9..f55113a4db8b7fb31a566a9d04c648d8044677d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * configure.in (gui_b): Add mbrtowc checking.
+       Resurrect [utf8/]wchar.h checking.
+
 2005-05-09  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/advanced-notation.itely (Metronome marks):

diff --git a/configure.in b/configure.in
index 428cb0d88c12204f3c4624f85253045432384638..a3ca5b74af32cd0889a00c5cc1e0ce5cd8c32677 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.14)
 STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
 
-AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h])
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
 AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([sstream])
 AC_LANG_POP(C++)
@@ -67,6 +67,8 @@ AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
+AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 if test "$gui_b" = "yes"; then