summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2008-09-18 19:48:44 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2008-09-18 19:48:44 +0800
commit67813eb809537db4ef862822f691f9da5eb976f8 (patch)
tree88927a3e1e4c61a6700f79b2258736a37b483e17
parent5e233e2d3efc5f961cad1c57071363c8f990eecc (diff)
downloadibus-67813eb809537db4ef862822f691f9da5eb976f8.tar.gz
ibus-67813eb809537db4ef862822f691f9da5eb976f8.tar.xz
ibus-67813eb809537db4ef862822f691f9da5eb976f8.zip
Check iso-codes in configure.
-rw-r--r--configure.ac22
1 files changed, 19 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3718971..6ddccbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,12 +177,12 @@ PKG_CHECK_MODULES(PYGTK,
AC_SUBST(PYGTK_CFLAGS)
AC_SUBST(PYGTK_LIBS)
if test x"$IBUS_HAS_PYGTK" != x"yes" -a x"$enable_pygconf" = x"yes"; then
- AC_MSG_ERROR(could not build python gconf binding without pygtk-2.0)
+ AC_MSG_ERROR(can not build python gconf binding without pygtk-2.0)
fi
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
if test x"$PYGTK_CODEGEN" = x"no" -a x"$enable_pygconf" = x"yes"; then
- AC_MSG_ERROR(could not build python gconf binding without pygtk-codegen-2.0)
+ AC_MSG_ERROR(can not build python gconf binding without pygtk-codegen-2.0)
fi
PKG_CHECK_MODULES(GCONF,
@@ -193,11 +193,27 @@ PKG_CHECK_MODULES(GCONF,
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
if test x"$IBUS_HAS_GCONF" != x"yes" -a x"$enable_pygconf" = x"yes"; then
- AC_MSG_ERROR(could not build python gconf binding without gconf-2.0)
+ AC_MSG_ERROR(can not build python gconf binding without gconf-2.0)
fi
AM_CONDITIONAL(IBUS_BUILD_PYGCONF, [test x"$enable_pygconf" = x"yes" ])
+# check iso-codes
+AC_ARG_ENABLE(iso-codes-check,
+ AS_HELP_STRING([--disable-iso-codes-check],
+ [Do not check iso-codes]),
+ [enable_iso_codes_check=$enableval],
+ [enable_iso_codes_check=yes],
+)
+PKG_CHECK_MODULES(ISOCODES,
+ iso-codes,
+ [IBUS_HAS_ISOCODES=yes],
+ [IBUS_HAS_ISOCODES=no],
+)
+if test x"$IBUS_HAS_ISOCODES" != x"yes" -a x"$enable_iso_codes_check" != x"no"; then
+ AC_MSG_ERROR(can not find iso-codes)
+fi
+
# OUTPUT files
AC_CONFIG_FILES([ po/Makefile.in
Makefile