+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.
/* define if you have libkpathsea.so */
#define HAVE_LIBKPATHSEA_SO 0
+
+/* define if you have utf8/wchar.h */
+#define HAVE_UTF8_WCHAR_H 0
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
#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"
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