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

[makeinu@freedesktop.org]

Author: makeinu
Date: 2005-01-06 21:46:50 -0800 (Thu, 06 Jan 2005)
New Revision: 148

Modified:
   trunk/configure.ac
   trunk/helper/Makefile.am
Log:
* configure.ac, helper/Makefile.am:
  Fixed some bugs in detecting gtk+-2.4 issue.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-01-07 04:24:41 UTC (rev 147)
+++ trunk/configure.ac	2005-01-07 05:46:50 UTC (rev 148)
@@ -173,7 +173,7 @@
     esac
   ],
   [ 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") ])
+    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],
@@ -307,7 +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(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-07 04:24:41 UTC (rev 147)
+++ trunk/helper/Makefile.am	2005-01-07 05:46:50 UTC (rev 148)
@@ -37,12 +37,16 @@
 
 if GTK2
 
-bin_PROGRAMS = uim-candwin-gtk uim-toolbar-gtk uim-toolbar-gtk-systray uim-im-switcher uim-input-pad-ja uim-pref-gtk
+bin_PROGRAMS = uim-candwin-gtk uim-toolbar-gtk uim-toolbar-gtk-systray uim-im-switcher uim-input-pad-ja
 
 if DICT
 bin_PROGRAMS += uim-dict
 endif
 
+if GTK2_4
+bin_PROGRAMS += uim-pref-gtk
+endif
+
 uim_candwin_gtk_SOURCES  = helper-candwin-gtk.c
 uim_candwin_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
 uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)