[uim-commit] r599 - in trunk: . uim

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-07 07:40:46 -0800 (Mon, 07 Feb 2005)
New Revision: 599

Modified:
   trunk/configure.ac
   trunk/uim/Makefile.am
Log:
* configure.ac, uim/Makefile.am: Version check of prime is added.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-02-07 14:21:45 UTC (rev 598)
+++ trunk/configure.ac	2005-02-07 15:40:46 UTC (rev 599)
@@ -119,6 +119,22 @@
 	use_canna="no"
 ])
 
+# ***********************
+# *** Tests for PRIME ***
+# ***********************
+AC_ARG_WITH(prime,
+	AS_HELP_STRING([--with-prime], [Build a plugin for PRIME]),
+	[
+	if test "x$with_prime" = "xyes"; then
+	        PKG_CHECK_MODULES(PRIME, prime >= 0.8.5.2, use_prime="yes",use_prime="no")
+	else
+		use_canna="no"
+	fi
+	],[
+	        PKG_CHECK_MODULES(PRIME, prime >= 0.8.5.2, use_prime="yes",use_prime="no")
+])
+
+
 AC_PATH_XTRA
 
 use_xim="no"
@@ -287,15 +303,18 @@
     use_qtimmodule="no"
   ])
 
-AC_ARG_ENABLE(dummy,
+default_toolkit="gtk"
+AC_ARG_ENABLE(default-toolkit,
   AC_HELP_STRING([--default-toolkit],
                  [Determine default toolkit]),
   [],
   [
-  default_toolkit=gtk
-  if test x"$default_toolkit" = "xgtk" && test x"use_gtk2" = "xyes"; then
-     default_toolkit=gtk
+  if test x"$enable_default_toolkit" = "xgtk" && test x"use_gtk2" = "xyes"; then
+     default_toolkit="gtk"
   fi
+  if test x"$enable_default_toolkit" = "xqt" && test x"use_qt" = "xyes"; then
+     default_toolkit="qt"
+  fi
   ])
 
 AC_ARG_ENABLE(debug,
@@ -384,7 +403,7 @@
 AM_CONDITIONAL(SCIM, test x$use_scim = xyes)
 AM_CONDITIONAL(ANTHY, test x$use_anthy = xyes)
 AM_CONDITIONAL(CANNA, test x$use_canna = xyes)
-AM_CONDITIONAL(PRIME, true)
+AM_CONDITIONAL(PRIME, test x$use_prime = xyes)
 AM_CONDITIONAL(SKK, true)
 AM_CONDITIONAL(GTK2, test x$use_gtk2 = xyes)
 AM_CONDITIONAL(GTK2_4, test x$use_gtk2_4 = xyes)

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-02-07 14:21:45 UTC (rev 598)
+++ trunk/uim/Makefile.am	2005-02-07 15:40:46 UTC (rev 599)
@@ -69,11 +69,13 @@
   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
-uim_plugin_LTLIBRARIES += libuim-prime.la
-libuim_prime_la_SOURCES = prime.c
-libuim_prime_la_LIBADD = libuim.la
-libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
-libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
+if PRIME
+  uim_plugin_LTLIBRARIES += libuim-prime.la
+  libuim_prime_la_SOURCES = prime.c
+  libuim_prime_la_LIBADD = libuim.la
+  libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+  libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
+endif
 
 uim_plugin_LTLIBRARIES += libuim-skk.la
 libuim_skk_la_SOURCES = skk-dic.c