OpenBSD puts the wchar.h file into a utf8 subdirectory, and uses a
libutf8.a library. I added a rule to configure to detect this situation,
and adjust accordingly.
Also, I had a problem with the new check for the shared libkpathsea
library; for some reason the shared_size variable was not being set. I
altered the code to something which does work, and I believe won't fail on
other systems.
-Dave Jedlinsky
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.3355
diff -u -r1.3355 ChangeLog
--- ChangeLog 29 Mar 2005 18:55:53 -0000 1.3355
+++ ChangeLog 29 Mar 2005 21:25:56 -0000
@@ -1,3 +1,9 @@
+2005-03-29 David Jedlinsky <[EMAIL PROTECTED]>
+
+ * configure.in: Detect libutf8/wchar.h variant.
+
+ * stepmake/aclocal.m4: Modify shared size test.
+
2005-03-29 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scripts/convert-ly.py (conv): add stencil-aligned-to! rule.
Index: config.hh.in
===================================================================
RCS file: /cvsroot/lilypond/lilypond/config.hh.in,v
retrieving revision 1.39
diff -u -r1.39 config.hh.in
--- config.hh.in 28 Mar 2005 16:27:00 -0000 1.39
+++ config.hh.in 29 Mar 2005 21:25:56 -0000
@@ -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
Index: configure.in
===================================================================
RCS file: /cvsroot/lilypond/lilypond/configure.in,v
retrieving revision 1.143
diff -u -r1.143 configure.in
--- configure.in 28 Mar 2005 11:42:05 -0000 1.143
+++ configure.in 29 Mar 2005 21:25:56 -0000
@@ -65,6 +65,7 @@
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
Index: lily/general-scheme.cc
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/general-scheme.cc,v
retrieving revision 1.12
diff -u -r1.12 general-scheme.cc
--- lily/general-scheme.cc 28 Mar 2005 21:03:18 -0000 1.12
+++ lily/general-scheme.cc 29 Mar 2005 21:25:56 -0000
@@ -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"
Index: stepmake/aclocal.m4
===================================================================
RCS file: /cvsroot/lilypond/lilypond/stepmake/aclocal.m4,v
retrieving revision 1.134
diff -u -r1.134 aclocal.m4
--- stepmake/aclocal.m4 28 Mar 2005 15:51:01 -0000 1.134
+++ stepmake/aclocal.m4 29 Mar 2005 21:25:56 -0000
@@ -797,7 +797,8 @@
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
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
