[uim-commit] r2289 - in trunk: . scm uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-29 22:34:36 -0800 (Tue, 29 Nov 2005)
New Revision: 2289

Modified:
   trunk/configure.ac
   trunk/scm/Makefile.am
   trunk/uim/Makefile.am
Log:
* configure.ac : Bump version and use AM_INIT_AUTOMAKE(1.8.3).
  Add simple check for mana.
* scm/Makefile.am : Include mana into module_names conditionally.
* uim/Makefile.am : Build libuim-mana.so conditionally.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-30 06:26:16 UTC (rev 2288)
+++ trunk/configure.ac	2005-11-30 06:34:36 UTC (rev 2289)
@@ -1,7 +1,7 @@
 AC_PREREQ(2.57)
 
-AC_INIT([uim], 0.5.0, [tkng at xem.jp])
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AC_INIT([uim], [1.0.0], [uim at lists.freedesktop.org])
+AM_INIT_AUTOMAKE(1.8.3)
 
 AC_CONFIG_SRCDIR([COPYING])
 
@@ -104,6 +104,31 @@
 ])
 
 # ***********************
+# *** Tests for Mana ***
+# ***********************
+AC_ARG_WITH(mana,
+	AS_HELP_STRING([--with-mana], [Build a plugin for Mana]),
+	[
+	if test "x$with_mana" = "xyes"; then
+	        AC_CHECK_PROG(MANA, mana, mana)
+		if test -n "$MANA"; then
+			use_mana="yes"
+		else
+			use_mana="no"
+		fi
+	else
+		use_mana="no"
+	fi
+	],[
+	        AC_CHECK_PROG(MANA, mana, mana)
+		if test -n "$MANA"; then
+			use_mana="yes"
+		else
+			use_mana="no"
+		fi
+])
+
+# ***********************
 # *** Tests for PRIME ***
 # ***********************
 AC_ARG_WITH(prime,
@@ -118,7 +143,6 @@
 	        PKG_CHECK_MODULES(PRIME, prime >= 0.8.5.2, use_prime="yes",use_prime="no")
 ])
 
-
 AC_PATH_XTRA
 
 use_xim="no"
@@ -537,6 +561,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(MANA, test x$use_mana = xyes)
 AM_CONDITIONAL(PRIME, test x$use_prime = xyes)
 AM_CONDITIONAL(SKK, true)
 AM_CONDITIONAL(GTK2, test x$use_gtk2 = xyes)
@@ -803,6 +828,7 @@
 
    Anthy           : ${use_anthy}
    Canna           : ${use_canna}
+   Mana            : ${use_mana}
    PRIME           : ${use_prime}
    m17n-lib        : ${use_m17nlib}
    SCIM            : ${use_scim}

Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-11-30 06:26:16 UTC (rev 2288)
+++ trunk/scm/Makefile.am	2005-11-30 06:34:36 UTC (rev 2289)
@@ -40,13 +40,16 @@
 if CANNA
   module_names += "canna"
 endif
+if MANA
+  module_names += "mana"
+endif
 if PRIME
   module_names += "prime"
 endif
 if SKK
   module_names += "skk"
 endif
-module_names += "mana" "tcode" "tutcode" "byeoru" "hangul" "viqr" "ipa-x-sampa" \
+module_names += "tcode" "tutcode" "byeoru" "hangul" "viqr" "ipa-x-sampa" \
 		"latin"
 if M17NLIB
   module_names += "m17nlib"

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-11-30 06:26:16 UTC (rev 2288)
+++ trunk/uim/Makefile.am	2005-11-30 06:34:36 UTC (rev 2289)
@@ -66,6 +66,14 @@
   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
 endif
 
+if MANA
+uim_plugin_LTLIBRARIES += libuim-mana.la
+libuim_mana_la_SOURCES = mana.c
+libuim_mana_la_LIBADD = libuim.la
+libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
+endif
+
 if PRIME
   uim_plugin_LTLIBRARIES += libuim-prime.la
   libuim_prime_la_SOURCES = prime.c
@@ -80,12 +88,6 @@
 libuim_skk_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
 libuim_skk_la_CPPFLAGS = -I$(top_srcdir)
 
-uim_plugin_LTLIBRARIES += libuim-mana.la
-libuim_mana_la_SOURCES = mana.c
-libuim_mana_la_LIBADD = libuim.la
-libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
-libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
-
 libuimincludedir =  $(includedir)/uim
 
 libuim_la_LDFLAGS = -version-info 0:2:0 -export-symbols-regex uim.\*