From c75f40f35168f752ba5380e229d889bfb7bf4074 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Sat, 15 May 2010 19:48:37 +0800
Subject: [PATCH] Add --disable-clients to disable gtk x11 clients

---
 client/Makefile.am |  2 ++
 configure.ac       | 50 ++++++++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index f0e298f..fb4e687 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -20,7 +20,9 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
+if ENABLE_CLIENTS
 SUBDIRS = \
 	gtk2 \
 	x11 \
 	$(NULL)
+endif
diff --git a/configure.ac b/configure.ac
index 835bdb2..508f58e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,21 +87,34 @@ PKG_CHECK_MODULES(GIO2, [
 PKG_CHECK_MODULES(GTHREAD2, [
     gthread-2.0 >= 2.18
 ])
-# PKG_CHECK_MODULES(PYGOBJECT2, [
-#     pygobject-2.0 >= 2.14
-# ])
 
-# check for gtk, gdk & pygtk
-PKG_CHECK_MODULES(GTK2, [
-    gtk+-2.0
-])
-
-gtk_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-GTK_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk_binary_version/immodules
-
-PKG_CHECK_MODULES(GDK2, [
-    gdk-2.0
-])
+AC_ARG_ENABLE(clients,
+    AS_HELP_STRING([--disable-clients],
+                   [Do not build gtk im module and ibux-x11]),
+    [enable_clients=$enableval],
+    [enable_clients=yes]
+)
+AM_CONDITIONAL([ENABLE_CLIENTS], [test x"$enable_clients" = x"yes"])
+
+if test x"$enable_clients" != x"no"; then
+    # check for gtk, gdk
+    PKG_CHECK_MODULES(GTK2, [
+        gtk+-2.0
+    ])
+
+    gtk_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+    GTK_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk_binary_version/immodules
+
+    PKG_CHECK_MODULES(GDK2, [
+        gdk-2.0
+    ])
+    # Check for x11
+    PKG_CHECK_MODULES(X11, [
+        x11
+    ])
+
+    AC_CHECK_HEADERS([X11/XKBlib.h])
+fi
 
 # check for gtk-doc
 GTK_DOC_CHECK(1.9)
@@ -117,7 +130,6 @@ AC_ARG_ENABLE(gconf,
     [enable_gconf=$enableval],
     [enable_gconf=yes]
 )
-
 AM_CONDITIONAL([ENABLE_GCONF], [test "x$enable_gconf" = "xyes"])
 
 if test x"$enable_gconf" != x"no"; then
@@ -137,13 +149,6 @@ else
     AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
 fi
 
-# Check for x11
-PKG_CHECK_MODULES(X11, [
-    x11
-])
-
-AC_CHECK_HEADERS([X11/XKBlib.h])
-
 # check env
 AC_PATH_PROG(ENV, env)
 AC_SUBST(ENV)
@@ -290,6 +295,7 @@ Build options:
   Build shared libs         $enable_shared
   Build static libs         $enable_static
   Gtk immodule dir          $GTK_IM_MODULEDIR
+  Build gtk, x11 clients    $enable_clients
   Build python modules      $enable_python
   Build gconf modules       $enable_gconf
   Build document            $enable_gtk_doc
-- 
2.7.4