From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 29 Mar 2005 23:05:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.18~45
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=027b2dfe65140e38e1f444988e17b9b73fcf7365;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index f15d827652..3e6af25b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-29  David Jedlinsky  <lilypond@ipnh.com>
+
+	* configure.in: Detect libutf8/wchar.h variant.
+
+	* stepmake/aclocal.m4: Modify shared size test.
+
 2005-03-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* make/lilypond.fedora.spec.in (Group): remove texmf profile stuff.
diff --git a/config.hh.in b/config.hh.in
index ee0ee4976a..77abe5c57e 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -93,3 +93,6 @@
 
 /* define if you have libkpathsea.so */
 #define HAVE_LIBKPATHSEA_SO 0
+
+/* define if you have utf8/wchar.h */
+#define HAVE_UTF8_WCHAR_H 0
diff --git a/configure.in b/configure.in
index 69d77cbc50..6c43498096 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,7 @@ AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([fopencookie funopen gettext isinf memmem snprintf vsnprintf])
+AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
 
 
 if test "$gui_b" = "yes"; then
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 28b851af41..6b96f3e14e 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -13,7 +13,11 @@
 #include <math.h>  /* isinf */
 #include <stdio.h>
 #include <string.h>  /* memset */
-#include <wchar.h>  /* wcrtomb */
+#ifdef HAVE_UTF8_WCHAR_H
+#include <utf8/wchar.h>  /* wcrtomb */
+#else
+#include <wchar.h> /* wcrtomb */
+#endif
 
 #include "libc-extension.hh"
 #include "lily-guile.hh"
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 62989a5009..b05f9a4cac 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -797,7 +797,8 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     AC_TRY_LINK([#include <kpathsea/kpathsea.h>],
                  [kpse_var_expand ("\$TEXMF");],
                  [have_libkpathsea_so=maybe;
-		  shared_size=`wc -c conftest | sed -e 's/ .*//g'`],
+		  shared_size=`wc -c conftest`;
+		  shared_size=`echo $shared_size | sed -e 's/ .*//g'`],
                  [have_libkpathsea_so=no])
 
     if test "$have_libkpathsea_so" = "maybe"; then