[libgda] Only propose GdaBrowser's help if gnome-doc-util is available

[Vivien Malerba <vivien src gnome org>]

commit f3823691c34a89c151eef63d47a2f42539bdfb5f
Author: Vivien Malerba <malerba gnome-db org>
Date:   Thu Apr 15 22:09:06 2010 +0200

    Only propose GdaBrowser's help if gnome-doc-util is available

 configure.in                              |    7 +++++--
 tools/browser/Makefile.am                 |    5 ++++-
 tools/browser/browser-window.c            |    6 ++++++
 tools/browser/data-manager/data-console.c |    7 ++++++-
 tools/browser/support.c                   |    2 ++
 tools/browser/support.h                   |    2 ++
 6 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2ea67ea..c70b39b 100644
--- a/configure.in
+++ b/configure.in
@@ -109,8 +109,11 @@ AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 dnl -- Initialize docs
-GNOME_DOC_INIT([0.9.0],,
-  [AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
+GNOME_DOC_INIT([0.9.0],[have_gdu=yes],[have_gdu=no])
+if test x$have_gdu != xno; then
+   AC_DEFINE(HAVE_GDU, [1], [GdaBrowser documentation is built])
+fi
+AM_CONDITIONAL(HAVE_GDU, test x$have_gdu != xno)
 
 dnl ******************************
 dnl glib-genmarshal
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 5f61999..3a53c10 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -1,12 +1,15 @@
 bin_PROGRAMS=gda-browser-4.0
 noinst_LTLIBRARIES = libbrowser.la
 
-SUBDIRS = data common schema-browser query-exec data-manager dummy-perspective help
+SUBDIRS = data common schema-browser query-exec data-manager dummy-perspective
 if HAVE_GOOCANVAS
 SUBDIRS+=canvas
 noinst_PROGRAMS=canvas-example
 endif
 SUBDIRS+= . doc
+if HAVE_GDU
+SUBDIRS+=help
+endif
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
diff --git a/tools/browser/browser-window.c b/tools/browser/browser-window.c
index 3248c47..26ff4c7 100644
--- a/tools/browser/browser-window.c
+++ b/tools/browser/browser-window.c
@@ -203,7 +203,9 @@ static void transaction_commit_cb (GtkAction *action, BrowserWindow *bwin);
 static void transaction_rollback_cb (GtkAction *action, BrowserWindow *bwin);
 static void quit_cb (GtkAction *action, BrowserWindow *bwin);
 static void about_cb (GtkAction *action, BrowserWindow *bwin);
+#ifdef HAVE_GDU
 static void manual_cb (GtkAction *action, BrowserWindow *bwin);
+#endif
 static void window_close_cb (GtkAction *action, BrowserWindow *bwin);
 static void window_fullscreen_cb (GtkToggleAction *action, BrowserWindow *bwin);
 static void window_new_cb (GtkAction *action, BrowserWindow *bwin);
@@ -240,7 +242,9 @@ static const GtkActionEntry ui_actions[] = {
         { "WindowClose", GTK_STOCK_CLOSE, "_Close", "", "Close this window", G_CALLBACK (window_close_cb)},
         { "Help", NULL, "_Help", NULL, "Help", NULL },
         { "HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, "About", G_CALLBACK (about_cb) },
+#ifdef HAVE_GDU
         { "HelpManual", GTK_STOCK_HELP, "_Manual", "F1", "Manual", G_CALLBACK (manual_cb) },
+#endif
 	{ "TransactionBegin", BROWSER_STOCK_BEGIN, N_("Begin"), NULL, N_("Begin a new transaction"),
           G_CALLBACK (transaction_begin_cb)},
         { "TransactionCommit", BROWSER_STOCK_COMMIT, N_("Commit"), NULL, N_("Commit current transaction"),
@@ -1022,11 +1026,13 @@ about_cb (GtkAction *action, BrowserWindow *bwin)
         gtk_widget_show (dialog);
 }
 
+#ifdef HAVE_GDU
 void
 manual_cb (GtkAction *action, BrowserWindow *bwin)
 {
 	browser_show_help (GTK_WINDOW (bwin), NULL);
 }
+#endif
 
 
 /**
diff --git a/tools/browser/data-manager/data-console.c b/tools/browser/data-manager/data-console.c
index bab0186..78d1984 100644
--- a/tools/browser/data-manager/data-console.c
+++ b/tools/browser/data-manager/data-console.c
@@ -169,7 +169,9 @@ data_console_get_type (void)
 static void editor_clear_clicked_cb (GtkButton *button, DataConsole *dconsole);
 static void variables_clicked_cb (GtkToggleButton *button, DataConsole *dconsole);
 static void execute_clicked_cb (GtkButton *button, DataConsole *dconsole);
+#ifdef HAVE_GDU
 static void help_clicked_cb (GtkButton *button, DataConsole *dconsole);
+#endif
 static void spec_editor_toggled_cb (GtkToggleButton *button, DataConsole *dconsole);
 static void spec_editor_changed_cb (SpecEditor *sped, DataConsole *dconsole);
 
@@ -316,11 +318,12 @@ data_console_new (BrowserConnection *bcnc)
 	g_signal_connect (button, "toggled",
 			  G_CALLBACK (spec_editor_toggled_cb), dconsole);
 
+#ifdef HAVE_GDU
 	button = browser_make_small_button (FALSE, _("Help"), GTK_STOCK_HELP, _("Help"));
 	gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
 	g_signal_connect (button, "clicked",
 			  G_CALLBACK (help_clicked_cb), dconsole);
-
+#endif
 
 
 	/* data contents page */
@@ -352,11 +355,13 @@ execute_clicked_cb (GtkButton *button, DataConsole *dconsole)
 	data_console_execute (dconsole);
 }
 
+#ifdef HAVE_GDU
 static void
 help_clicked_cb (GtkButton *button, DataConsole *dconsole)
 {
 	browser_show_help ((GtkWindow*) gtk_widget_get_toplevel (dconsole), "data-manager-perspective");
 }
+#endif
 
 static void
 variables_clicked_cb (GtkToggleButton *button, DataConsole *dconsole)
diff --git a/tools/browser/support.c b/tools/browser/support.c
index 1bf6fdc..f476556 100644
--- a/tools/browser/support.c
+++ b/tools/browser/support.c
@@ -220,6 +220,7 @@ browser_show_notice (GtkWindow *parent, const gchar *context, const gchar *forma
 	}
 }
 
+#ifdef HAVE_GDU
 /**
  * browser_show_help
  * @topic: the help topic, or %NULL for the global index
@@ -294,6 +295,7 @@ browser_show_help (GtkWindow *parent, const gchar *topic)
 
 	g_free (uri);
 }
+#endif
 
 static GtkWidget *
 _browser_make_tab_label (const gchar *label,
diff --git a/tools/browser/support.h b/tools/browser/support.h
index accae8d..3066c4b 100644
--- a/tools/browser/support.h
+++ b/tools/browser/support.h
@@ -32,7 +32,9 @@ BrowserConnection *browser_connection_open (GError **error);
 gboolean           browser_connection_close (GtkWindow *parent, BrowserConnection *bcnc);
 void               browser_show_error (GtkWindow *parent, const gchar *format, ...);
 void               browser_show_notice (GtkWindow *parent, const gchar *context, const gchar *format, ...);
+#ifdef HAVE_GDU
 void               browser_show_help (GtkWindow *parent, const gchar *topic);
+#endif
 
 GtkWidget*         browser_make_tab_label_with_stock (const gchar *label,
 						      const gchar *stock_id, gboolean with_close,