[Mlterm-dev-ja] [PATCH] Xutf8LookupString() missing in XFree86

[Nobuyoshi N. <nob...@so...>]

はじめまして、中田といいます。

CVSの最新が、XFree86 4.1.0でコンパイルに失敗します。どうやら、
X_HAVE_UTF8STRINGは定義されていても、Xutf8LookupString()は未実
装のようです。オンラインマニュアルにはしっかり書いてあるくせに。


Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/mlterm/mlterm/src/Makefile.in,v
retrieving revision 1.15
diff -u -2 -p -r1.15 Makefile.in
--- src/Makefile.in	19 Feb 2002 15:44:48 -0000	1.15
+++ src/Makefile.in	2 Mar 2002 15:31:48 -0000
@@ -32,5 +32,5 @@ LKIK_DEB = -lkik_deb
 
 CFLAGS=$(CFLAGS_LOCAL) @KIK_CFLAGS@ @MKF_CFLAGS@ @DEB_CFLAGS@ @IMLIB_CFLAGS@ @FRIBIDI_CFLAGS@ \
-	@AA_CFLAGS@ @UCS4_CFLAGS@ @IND_CFLAGS@ @UTMP_CFLAGS@ @CFLAGS@ \
+	@AA_CFLAGS@ @UCS4_CFLAGS@ @IND_CFLAGS@ @UTMP_CFLAGS@ @XUTF8_CFLAGS@ @CFLAGS@ \
 	-DLIBDIR=\"$(LIBDIR)\" -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" \
 	-I/usr/X11R6/include -I/usr/local/include
Index: src/ml_xic.c
===================================================================
RCS file: /cvsroot/mlterm/mlterm/src/ml_xic.c,v
retrieving revision 1.9
diff -u -2 -p -r1.9 ml_xic.c
--- src/ml_xic.c	3 Feb 2002 08:37:22 -0000	1.9
+++ src/ml_xic.c	2 Mar 2002 15:31:48 -0000
@@ -515,5 +515,5 @@ ml_xic_get_utf8_str(
 	)
 {
-#ifdef  X_HAVE_UTF8_STRING
+#ifdef  HAVE_XUTF8_LOOKUP_STRING
 	Status  stat ;
 	size_t  len ;
Index: configure.in
===================================================================
RCS file: /cvsroot/mlterm/mlterm/autoconf/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- autoconf/configure.in	2 Mar 2002 13:29:13 -0000	1.11
+++ autoconf/configure.in	2 Mar 2002 16:41:11 -0000
@@ -47,6 +47,15 @@
 
 AC_PATH_XTRA
 
+# XFree86 4.1.0 defines X_HAVE_UTF8_STRING but has no Xutf8LookupString.
+ldflags="$LDFLAGS" cflags="$CFLAGS"
+LDFLAGS="$LDFLAGS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" CFLAGS="$X_CFLAGS $CFLAGS"
+AC_CHECK_LIB(X11,Xutf8LookupString,XUTF8_CFLAGS="$XUTF8_CFLAGS -DHAVE_XUTF8_LOOKUP_STRING")
+AC_CHECK_LIB(X11,Xutf8TextListToTextProperty,XUTF8_CFLAGS="$XUTF8_CFLAGS -DHAVE_XUTF8_TEXT_LIST_TO_TEXT_PROPERTY")
+AC_CHECK_LIB(X11,Xutf8TextPropertyToTextList,XUTF8_CFLAGS="$XUTF8_CFLAGS -DHAVE_XUTF8_TEXT_PROPERTY_TO_TEXT_LIST")
+LDFLAGS="$ldflags" CFLAGS="$cflags"
+AC_SUBST(XUTF8_CFLAGS)
+
 AC_ARG_ENABLE(debug,
 	[  --enable-debug          debug[disabled]],
 	debug=$enable_debug)


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦