[libgda/LIBGDA_4.2] Fixed bug #647887

[Vivien Malerba <vivien src gnome org>]

commit 03a253bfc7be840699333e5ec5ba9a0c0e0e0af4
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Apr 19 18:55:51 2011 +0200

    Fixed bug #647887
    
    Applied patch with modifications

 configure.ac          |   45 +++++++++++++++++++++++++++++++++++++++++++++
 libgda-ui/Makefile.am |    2 +-
 libgda/Makefile.am    |    2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4ae2f0a..cc0a6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,6 +436,49 @@ dnl *********************************
 dnl Check for GObject Introspection
 dnl *********************************
 GOBJECT_INTROSPECTION_CHECK([0.6.5])
+AC_ARG_ENABLE([gda-gi],
+    AS_HELP_STRING([--enable-gda-gi], [Enable GObject Introspection for libgda [default=auto]]),
+    [enable_gda_gi=$enableval],[enable_gda_gi=auto])
+
+if test "x$found_introspection" = xno
+then
+    if test "x$enable_gda_gi" = xyes
+    then
+	AC_MSG_ERROR([Introspection for Libgda is requested but not available])
+    fi
+    if test "x$enable_gda_gi" = xauto
+    then
+	enable_gda_gi=no
+    fi
+else
+    if test "x$enable_gda_gi" = xauto
+    then
+        enable_gda_gi=yes
+    fi
+fi
+AM_CONDITIONAL(ENABLE_GDA_GI, [test "$enable_gda_gi" = "yes"])
+
+AC_ARG_ENABLE([gdaui-gi],
+    AS_HELP_STRING([--enable-gdaui-gi], [Enable GObject Introspection for libgda-ui [default=auto]]),
+    [enable_gdaui_gi=$enableval],[enable_gdaui_gi=auto])
+
+if test "x$found_introspection" = xno
+then
+    if test "x$enable_gdaui_gi" = xyes
+    then
+	AC_MSG_ERROR([Introspection for Libgda UI is requested but not available])
+    fi
+    if test "x$enable_gdaui_gi" = xauto
+    then
+	enable_gdaui_gi=no
+    fi
+else
+    if test "x$enable_gdaui_gi" = xauto
+    then
+        enable_gdaui_gi=yes
+    fi
+fi
+AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$enable_gdaui_gi" = "yes"])
 
 dnl ******************************
 dnl Checks for libcrypto
@@ -908,6 +951,8 @@ echo " Configuration summary for version $GDA_VERSION"
 echo "   Installation prefix = $prefix"
 echo "   Building GTK+ UI extension: `if test x$have_ui != xno; then echo yes; else echo no; fi`"
 echo "   Building Libxslt extension: `if test x$have_xslt != xno; then echo yes; else echo no; fi`"
+echo "   Building libgda GObject Introspection: `if test x$enable_gda_gi != xno; then echo yes; else echo no; fi`"
+echo "   Building libgda-ui GObject Introspection: `if test x$enable_gdaui_gi != xno; then echo yes; else echo no; fi`"
 echo "   Compiled providers:"
 echo "      Berkeley DB = $bdb_found"
 echo "      Berkeley DB SQL = $bdbsql_found"
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 8bdc52a..f1abb39 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -162,7 +162,7 @@ dtd_DATA=$(DTD_FILES)
 
 EXTRA_DIST = $(DTD_FILES) libgda-ui.symbols
 
-if HAVE_INTROSPECTION
+if ENABLE_GDAUI_GI
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 72c7157..fd37f6f 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -288,7 +288,7 @@ EXTRA_DIST = \
 	keywords.list
 
 DISTCLEANFILES  = .deps/*.P
-if HAVE_INTROSPECTION
+if ENABLE_GDA_GI
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \