From: janneke <janneke>
Date: Mon, 9 May 2005 19:47:34 +0000 (+0000)
Subject: (gui_b): Add mbrtowc checking.
X-Git-Tag: release/2.5.32^2~240
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=30118ca4c64daa85b96911ca4c44185d1b903e95;p=lilypond.git

(gui_b): Add mbrtowc checking.
Resurrect [utf8/]wchar.h checking.
---

diff --git a/ChangeLog b/ChangeLog
index 20893fb15f..f55113a4db 100644
--- 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 428cb0d88c..a3ca5b74af 100644
--- 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