Add --without-libgnome, check for libgnome and libgnomeui separately, and

2007-05-04  Ross Burton  <ross@openedhand.com>

	* configure.ac:
	Add --without-libgnome, check for libgnome and libgnomeui
	separately, and add them to the symbols as required.

	* libdocument/ev-file-helpers.c:
	When building without libgnome, use g_get_user_config_dir instead
	of gnome_user_dir_get.

	* shell/ev-application.c:
	When building without libgnome, don't use session management.

	* shell/main.c:
	When building without libgnome, don't use GnomeProgram or
	initialise the authentication manager.

	This fixes #328842.

svn path=/trunk/; revision=2436

1 files changed, 32 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index b418a54..8962561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,13 +54,26 @@ LIBXML_REQUIRED=2.5.0
 
 GTK_PRINT_REQUIRED=2.10.0
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
-PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libgnome-2.0 >= $LIBGNOME_REQUIRED)
-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 gnome-vfs-2.0)
-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
+PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
+PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
+PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0)
+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
+
+AC_ARG_WITH(libgnome,
+        AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]),
+	[case "${withval}" in
+	yes) WITH_GNOME=yes ;;
+	no) WITH_GNOME=no ;;
+	*) AC_MSG_ERROR(bad value ${withval} for --with-libgnome) ;;
+	esac],
+	[WITH_GNOME=yes]) dnl Default value
+AM_CONDITIONAL(WITH_GNOME, test x$WITH_GNOME = "xyes")
 
-BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-AC_SUBST(BACKEND_CFLAGS)
+if test x$WITH_GNOME = "xyes"; then
+        PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED)
+        PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+        AC_DEFINE([WITH_GNOME],[1],[Define if GNOME support is enabled])
+fi
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
@@ -134,8 +147,18 @@ if test "x$enable_dbus" = "xyes" ; then
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
 fi
 
-SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
+LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS"
+LIB_LIBS="$LIB_LIBS $GNOME_LIBS"
+AC_SUBST(LIB_CFLAGS)
+AC_SUBST(LIB_LIBS)
+
+BACKEND_CFLAGS="$BACKEND_CFLAGS $GNOME_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
+BACKEND_LIBS="$BACKEND_LIBS $GNOME_LIBS"
+AC_SUBST(BACKEND_CFLAGS)
+AC_SUBST(BACKEND_LIBS)
+
+SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $GNOMEUI_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
+SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $GNOMEUI_LIBS -lz"
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
 
@@ -468,6 +491,7 @@ AC_OUTPUT
 
 echo "
 Configure summary:
+	GNOME Support......:  $WITH_GNOME
 	Print Support......:  $enable_print
 	DBUS Support.......:  $enable_dbus
 	Nautilus Plugin....:  $HAVE_NAUTILUS