[uim-commit] r146 - in trunk: . helper

[tkng@freedesktop.org]

Author: tkng
Date: 2005-01-06 13:42:13 -0800 (Thu, 06 Jan 2005)
New Revision: 146

Modified:
   trunk/configure.ac
   trunk/helper/Makefile.am
Log:
* configure.ac, helper/Makefile.am:
 Require GTK+ 2.2 for GTK+ immodule, require GTK+ 2.4 for uim-pref-gtk.
 I don't test that it really works on GTK+ 2.2 environment and I have
 no will to support that. Report is welcome if patch is applied.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-01-06 18:13:42 UTC (rev 145)
+++ trunk/configure.ac	2005-01-06 21:42:13 UTC (rev 146)
@@ -167,11 +167,13 @@
         use_gtk2="no"
       ;;
       yes|*)
-        PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.4.0, use_gtk2="yes",use_gtk2="no")
+        PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
+        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2.4="yes",use_gtk2.4="no")
       ;;
     esac
   ],
-  [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.4.0, use_gtk2="yes",use_gtk2="no") ])
+  [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
+    PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2.4="yes",use_gtk2.4="no") ])
 
 AC_ARG_WITH(gnome2,
   AC_HELP_STRING([--without-gnome2],
@@ -305,6 +307,7 @@
 AM_CONDITIONAL(SCIM, test x$use_scim = xyes)
 AM_CONDITIONAL(CANNA, test x$use_canna = xyes)
 AM_CONDITIONAL(GTK2, test x$use_gtk2 = xyes)
+AM_CONDITIONAL(GTK2_4, test x$use_gtk2.4 = xyes)
 AM_CONDITIONAL(GNOME2, test x$use_gnome2 = xyes)
 AM_CONDITIONAL(APPLET, test x$use_applet = xyes)
 AM_CONDITIONAL(UIM_FEP, test x$use_uim_fep = xyes)

Modified: trunk/helper/Makefile.am
===================================================================
--- trunk/helper/Makefile.am	2005-01-06 18:13:42 UTC (rev 145)
+++ trunk/helper/Makefile.am	2005-01-06 21:42:13 UTC (rev 146)
@@ -68,10 +68,12 @@
 uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_input_pad_ja_CFLAGS   = @GTK2_CFLAGS@ -Wall
 
+if GTK2_4
 uim_pref_gtk_SOURCES  = pref-gtk.c
 uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
 uim_pref_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 uim_pref_gtk_CFLAGS   = @GTK2_CFLAGS@ -Wall
+endif
 
 if DICT
 uim_dict_SOURCES  = dict-main-gtk.c dict-anthy.c dict-anthy.h dict-canna.c dict-canna.h dict-word-win-gtk.c dict-word-win-gtk.h dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c dict-util.h dict-word-list-view-gtk.c dict-word-list-view-gtk.h dict-word.c dict-word.h dict-dict.c dict-dict.h dict-cclass-dialog.c dict-cclass-dialog.h