Author: ek.kato Date: Thu Jan 8 17:56:26 2009 New Revision: 5708
Modified: uim-chewing-trunk/configure.ac uim-chewing-trunk/src/chewing.c Log: * configure.ac * src/chewing.c - Support uim >= 1.6.0 Modified: uim-chewing-trunk/configure.ac ============================================================================== --- uim-chewing-trunk/configure.ac (original) +++ uim-chewing-trunk/configure.ac Thu Jan 8 17:56:26 2009 @@ -15,7 +15,7 @@ CHEWING_DATADIR=`$PKG_CONFIG chewing --variable=datadir` AC_DEFINE_UNQUOTED(CHEWING_DATADIR, "$CHEWING_DATADIR", [Chewing data dir]) -PKG_CHECK_MODULES(UIM, [uim >= 1.5.0 uim < 1.6.0]) +PKG_CHECK_MODULES(UIM, [uim >= 1.5.0]) UIM_LIBDIR=`$PKG_CONFIG uim --variable=libdir` UIM_SCMDIR=`$PKG_CONFIG uim --variable=uim_scmdir` uim_pixmapsdir=`$PKG_CONFIG uim --variable=uim_datadir`/pixmaps Modified: uim-chewing-trunk/src/chewing.c ============================================================================== --- uim-chewing-trunk/src/chewing.c (original) +++ uim-chewing-trunk/src/chewing.c Thu Jan 8 17:56:26 2009 @@ -41,8 +41,13 @@ #include <chewing.h> +#include <uim.h> #include <uim-scm.h> +#if UIM_VERSION_REQUIRE(1,6,0) +#include <dynlib.h> +#else #include <plugin.h> +#endif #include "keytab.h"
