[caribou] Disable im modules by default.

[Eitan Isaacson <eitani src gnome org>]

commit 4e4272e3ac4280303618db9d5f31386f3a139b6e
Author: Eitan Isaacson <eitan monotonous org>
Date:   Mon Jun 13 14:22:42 2011 -0700

    Disable im modules by default.

 Makefile.am    |    6 +-----
 configure.ac   |   38 +++++++++++++++++++++++++-------------
 im/Makefile.am |   10 +++++++++-
 3 files changed, 35 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5a1866e..e1af642 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,3 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = caribou bin data po libcaribou
-
-if ENABLE_IM_MODULES
-SUBDIRS += im
-endif
\ No newline at end of file
+SUBDIRS = caribou bin data po libcaribou im
diff --git a/configure.ac b/configure.ac
index 1b9ed9d..f8c4b7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,30 +58,42 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The gettext package])
 AM_GLIB_GNU_GETTEXT
 
 dnl == IM modules ==
-AC_ARG_ENABLE(im_modules,
-    AS_HELP_STRING([--disable-im-modules],
-                   [Do not build im modules]),
-    [enable_im_modules=$enableval],
-    [enable_im_modules=yes]
+AC_ARG_ENABLE(im_gtk3_module,
+    AS_HELP_STRING([--enable-im-gtk3-module],
+                   [Build GTK3 im module]),
+    [enable_gtk3_im_modules=$enableval],
+    [enable_gtk3_im_modules=no]
 )
-AM_CONDITIONAL([ENABLE_IM_MODULES], [test x"$enable_im_modules" = x"yes"])
+AM_CONDITIONAL([ENABLE_GTK3_IM_MODULE], [test x"$enable_gtk3_im_module" = x"yes"])
 
-if test x"$enable_im_modules" = x"yes"; then
-    PKG_CHECK_MODULES(GTK2, [
-        gtk+-2.0
-    ])
+if test x"$enable_gtk3_im_module" = x"yes"; then
     PKG_CHECK_MODULES(GTK3, [
         gtk+-3.0
     ])
-    gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-    GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules
-    AC_SUBST(GTK2_IM_MODULEDIR)
 
     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
     AC_SUBST(GTK3_IM_MODULEDIR)
 fi
 
+AC_ARG_ENABLE(im_gtk2_module,
+    AS_HELP_STRING([--enable-im-gtk2-module],
+                   [Build GTK2 im module]),
+    [enable_gtk2_im_modules=$enableval],
+    [enable_gtk2_im_modules=no]
+)
+AM_CONDITIONAL([ENABLE_GTK2_IM_MODULE], [test x"$enable_gtk2_im_module" = x"yes"])
+
+if test x"$enable_gtk2_im_module" = x"yes"; then
+    PKG_CHECK_MODULES(GTK2, [
+        gtk+-2.0
+    ])
+
+    gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+    GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules
+    AC_SUBST(GTK2_IM_MODULEDIR)
+fi
+
 dnl == GSettings ==
 GLIB_GSETTINGS
 
diff --git a/im/Makefile.am b/im/Makefile.am
index 24e42e7..db39a37 100644
--- a/im/Makefile.am
+++ b/im/Makefile.am
@@ -1 +1,9 @@
-SUBDIRS = gtk3 gtk2
+SUBDIRS =
+
+if ENABLE_GTK3_IM_MODULE
+SUBDIRS += gtk3
+endif
+
+if ENABLE_GTK2_IM_MODULE
+SUBDIRS += gtk2
+endif