2 new revisions:
Revision: b76cf89fa196
Author: nogu.dev <[email protected]>
Date: Sun Feb 26 06:28:32 2012
Log: * xim/canddisp.cpp...
http://code.google.com/p/uim/source/detail?r=b76cf89fa196
Revision: cb3d720e9914
Author: nogu.dev <[email protected]>
Date: Sun Feb 26 06:28:57 2012
Log: * configure.ac...
http://code.google.com/p/uim/source/detail?r=cb3d720e9914
==============================================================================
Revision: b76cf89fa196
Author: nogu.dev <[email protected]>
Date: Sun Feb 26 06:28:32 2012
Log: * xim/canddisp.cpp
- (candwin_command): Avoid compile error
when CANDWIN_PROG_SUFFIX isn't defined.
http://code.google.com/p/uim/source/detail?r=b76cf89fa196
Modified:
/xim/canddisp.cpp
=======================================
--- /xim/canddisp.cpp Wed Jan 11 00:17:24 2012
+++ /xim/canddisp.cpp Sun Feb 26 06:28:32 2012
@@ -81,7 +81,7 @@
#ifdef NO_TOOLKIT
return NULL;
-#endif
+#else
/*
Search order of candwin_command be summarized as follows
1. UIM_CANDWIN_PROG -- mainly for debugging purpose
@@ -114,6 +114,7 @@
snprintf(candwin_prog, MAXPATHLEN, "%s%s%s", CANDWIN_PROG_PREFIX,
type, CANDWIN_PROG_SUFFIX);
return candwin_prog;
+#endif
}
Canddisp *canddisp_singleton()
==============================================================================
Revision: cb3d720e9914
Author: nogu.dev <[email protected]>
Date: Sun Feb 26 06:28:57 2012
Log: * configure.ac
- Disable XIM feature when libXext isn't installed.
http://code.google.com/p/uim/source/detail?r=cb3d720e9914
Modified:
/configure.ac
=======================================
--- /configure.ac Sat Jan 21 06:30:54 2012
+++ /configure.ac Sun Feb 26 06:28:57 2012
@@ -334,11 +334,13 @@
use_xim="no"
if test x"$have_x" != "xdisabled" && test x"$have_x" != "xno"; then
- use_xim="yes"
- AC_CXX_NAMESPACES
- AC_CXX_HAVE_STL
- if test $ac_cv_cxx_have_stl = no; then
- use_xim="no"
+ PKG_CHECK_MODULES(XIM, xext, use_xim="yes", use_xim="no")
+ if test x"$use_xim" = "xyes"; then
+ AC_CXX_NAMESPACES
+ AC_CXX_HAVE_STL
+ if test $ac_cv_cxx_have_stl = no; then
+ use_xim="no"
+ fi
fi
AC_MSG_CHECKING([whether to have Xft support])
AM_PATH_XFT(yes, XFT=true, XFT=false)
