[dasher] Dasher no longer depends directly on libgnome nor libgnomeui. Fixes #573964.

[Patrick Welche <pwelche src gnome org>]

commit 5f2dac362cac47bed851acd113636ae3173a961c
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu May 14 15:13:26 2009 +0100

    Dasher no longer depends directly on libgnome nor libgnomeui. Fixes #573964.
    http://live.gnome.org/LIbgnomeMustDie
---
 ChangeLog     |    5 +++++
 INSTALL.Linux |    2 --
 Src/main.cc   |   22 ----------------------
 configure.ac  |    7 +------
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9516235..90ffc8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-14  Patrick Welche  <prlw1 cam ac uk>
+
+	* configure.ac, main.cc: Dasher no longer depends directly
+	on libgnome nor libgnomeui. Fixes #573964.
+
 2009-05-13  Patrick Welche  <prlw1 cam ac uk>
 
 	* dasher_main, configure.ac: Remove gnome_help_display_desktop and
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 09be8e0..2c261e4 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -20,8 +20,6 @@ distributions the following can be used.
 	    gnome-doc-utils
 	    libatspi-dev
 	    libgconf2-dev
-	    libgnome2-dev
-	    libgnomeui-dev
 	    libgtk2.0-dev
 	    libxtst-dev"
   sudo apt-get install $packages
diff --git a/Src/main.cc b/Src/main.cc
index 11b58ce..85ff8ea 100644
--- a/Src/main.cc
+++ b/Src/main.cc
@@ -1,9 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef GNOME_LIBS
 #include <glib/gi18n.h>
-#endif
 
 #include "Common/Common.h"
 
@@ -28,11 +26,6 @@
 #include <gpe/init.h>
 #endif
 
-#ifdef GNOME_LIBS
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
-#endif
-
 // #include <libintl.h>
 // #include <locale.h>
 // #include <stdio.h>
@@ -220,21 +213,6 @@ int main(int argc, char *argv[]) {
   osso_context = osso_initialize("dasher", PACKAGE_VERSION, TRUE, NULL);
 #endif
 
-#ifdef GNOME_LIBS
-  GnomeProgram *program = 0;
-#if GLIB_CHECK_VERSION(2,14,0)
-  program = gnome_program_init
-    (argv[0], PACKAGE_VERSION, LIBGNOMEUI_MODULE,
-     argc, argv,
-     GNOME_PARAM_GOPTION_CONTEXT, goptcontext, GNOME_PARAM_NONE);
-#else
-  program = gnome_program_init
-    (argv[0], PACKAGE_VERSION, LIBGNOMEUI_MODULE,
-     argc, argv,
-     GNOME_PARAM_NONE);
-#endif
-#endif /* GNOME_LIBS */
-
 #if (defined GNOME_SPEECH || defined GNOME_A11Y)
   if(!bonobo_is_initialized()) {
     if(!bonobo_init(&argc, argv)) {
diff --git a/configure.ac b/configure.ac
index 54efaa1..f8db1de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_ARG_ENABLE(debug,
          DEBUG=false)
 
 AC_ARG_WITH([gnome],
-	 AS_HELP_STRING([--with-gnome],[build with GNOME support (default is YES)]), 
+	 AS_HELP_STRING([--with-gnome],[build GNOME documentation (default is YES)]), 
 	 if test $withval = "no"; then
 	   WITHGNOME=false; 
 	 else
@@ -226,11 +226,6 @@ if test x"$DEBUG" = xtrue; then
 	AC_DEFINE([DEBUG], 1, [Additional debug checks enabled])
 fi
 
-if test x"$WITHGNOME" = xtrue; then
-	PKG_CHECK_MODULES(gnome, libgnome-2.0 libgnomeui-2.0 )
-	AC_DEFINE([GNOME_LIBS], 1, [libgnome-2 and libgnomeui-2 are present])
-fi
-
 if test x"$WITHSPEECH" = xtrue; then
 	PKG_CHECK_MODULES(gnome_speech, gnome-speech-1.0 bonobo-activation-2.0 libbonobo-2.0 ORBit-2.0)
 	AC_DEFINE([GNOME_SPEECH], 1, [gnome_speech-1 libraries are present])