[libgda] Correction for bug #684895

[Vivien Malerba <vivien src gnome org>]

commit c14e34b54a26bc17a02226f6fa674c7e5e4b7dca
Author: Vivien Malerba <malerba gnome-db org>
Date:   Thu Sep 27 22:14:42 2012 +0200

    Correction for bug #684895

 Makefile.am  |   15 +++++++++++----
 configure.ac |   11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0d1bdfc..9d4d308 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,19 +6,26 @@ XSLT_PC=libgda-xslt-$(GDA_ABI_VERSION).pc
 endif
 
 if HAVE_UI
-UI_DIRS=libgda-ui \
-	control-center
+UI_DIR=libgda-ui
 UI_PC=libgda-ui-$(GDA_ABI_VERSION).pc
 endif
 
+if ENABLE_TOOLS
+TOOLS_DIR=tools
+if HAVE_UI
+UI_TOOLS_DIR=control-center
+endif
+endif
+
 SUBDIRS = \
 	po \
 	libgda \
 	providers \
 	libgda-report \
 	$(XSLT_DIR) \
-	$(UI_DIRS) \
-	tools \
+	$(UI_DIR) \
+	$(TOOLS_DIR) \
+	$(UI_TOOLS_DIR) \
 	tests \
 	testing \
 	data \
diff --git a/configure.ac b/configure.ac
index 1996826..84df33d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,6 +366,16 @@ AC_SUBST(LIBTOOL_PROV_EXPORT_OPTIONS)
 AC_SUBST(LIBTOOL_UI_EXPORT_OPTIONS)
 AC_SUBST(NO_UNDEFINED)
 
+dnl ******************************
+dnl Option to avoid building tools
+dnl See bug #684895
+dnl ******************************
+AC_ARG_ENABLE([tools],
+	AS_HELP_STRING([--disable-tools], [Disable building and installing Libgda's associated tools (gda-sql, control-center, browser, ...)]),
+	[enable_tools=$enableval],[enable_tools=yes])
+
+AM_CONDITIONAL(ENABLE_TOOLS, [test "$enable_tools" = "yes"])
+
 dnl *******************************************************
 dnl Checks for GIO
 dnl *******************************************************
@@ -981,6 +991,7 @@ echo "   Building Gtk-Doc: `if test x$enable_gtk_doc != xno; then echo yes; else
 echo "   Building Vala Bindings: `if test x$enable_vala != xno; then echo yes; else echo no; fi`"
 echo "   Building Vala Extensions: `if test x$enable_vala_ext != xno; then echo yes; else echo no; fi`"
 echo "   Building Vala Documentation: `if test x$enable_vala_doc != xno; then echo yes; else echo no; fi`"
+echo "   Building Building Libgda's associated tools: `if test x$enable_tools = xyes; then echo yes; else echo no; fi`"
 echo "   Compiled providers:"
 echo "      Berkeley DB = $bdb_found"
 echo "      Berkeley DB SQL = $bdbsql_found"