From 35005c339d8ec23ba52fcff30cdf52455ceb1e16 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 23 Dec 2009 08:35:27 +0100 Subject: [PATCH] Bug 526451 - allow to build gconf and gnomevfs/gio support independently. r=ted --- configure.in | 177 ++++++++++++++----------- toolkit/system/gnome/Makefile.in | 10 +- toolkit/system/gnome/nsGnomeModule.cpp | 4 + 3 files changed, 106 insertions(+), 85 deletions(-) diff --git a/configure.in b/configure.in index cd554776c7a7..34db27cd74a6 100644 --- a/configure.in +++ b/configure.in @@ -5088,7 +5088,7 @@ then fi dnl ======================================================== -dnl = GnomeVFS support module +dnl = GnomeVFS, GIO and GConf support module dnl ======================================================== if test "$MOZ_X11" @@ -5101,6 +5101,9 @@ then MOZ_ENABLE_GCONF=1 fi + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== MOZ_ARG_DISABLE_BOOL(gnomevfs, [ --disable-gnomevfs Disable GnomeVFS support ], MOZ_ENABLE_GNOMEVFS=, @@ -5125,24 +5128,6 @@ then AC_SUBST(MOZ_GNOMEVFS_CFLAGS) AC_SUBST(MOZ_GNOMEVFS_LIBS) - if test "$MOZ_ENABLE_GCONF" - then - PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION,[ - MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` - MOZ_ENABLE_GCONF=1 - ],[ - MOZ_ENABLE_GCONF= - ]) - fi - - if test "$MOZ_ENABLE_GCONF"; then - AC_DEFINE(MOZ_ENABLE_GCONF) - fi - - AC_SUBST(MOZ_ENABLE_GCONF) - AC_SUBST(MOZ_GCONF_CFLAGS) - AC_SUBST(MOZ_GCONF_LIBS) - dnl ======================================================== dnl = GIO support module dnl ======================================================== @@ -5169,78 +5154,32 @@ then AC_SUBST(MOZ_ENABLE_GIO) AC_SUBST(MOZ_GIO_CFLAGS) AC_SUBST(MOZ_GIO_LIBS) -fi - -dnl ======================================================== -dnl = libgnomeui support module -dnl ======================================================== - -if test "$MOZ_ENABLE_GTK2" -then - MOZ_ENABLE_GNOMEUI=1 - - MOZ_ARG_DISABLE_BOOL(gnomeui, - [ --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) ], - MOZ_ENABLE_GNOMEUI=, - MOZ_ENABLE_GNOMEUI=force) - - if test "$MOZ_ENABLE_GNOMEUI" + + dnl ======================================================== + dnl = GConf support module + dnl ======================================================== + if test "$MOZ_ENABLE_GCONF" then - PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION, - [ - MOZ_GNOMEUI_LIBS=`echo $MOZ_GNOMEUI_LIBS | sed 's/-llinc\>//'` - MOZ_ENABLE_GNOMEUI=1 + PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[ + MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` + MOZ_ENABLE_GCONF=1 ],[ - if test "$MOZ_ENABLE_GNOMEUI" = "force" + if test "$MOZ_ENABLE_GCONF" = "force" then - AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION]) + AC_MSG_ERROR([* * * Could not find gconf-2.0 ]) fi - MOZ_ENABLE_GNOMEUI= + MOZ_ENABLE_GCONF= ]) fi - if test "$MOZ_ENABLE_GNOMEUI"; then - AC_DEFINE(MOZ_ENABLE_GNOMEUI) + if test "$MOZ_ENABLE_GCONF"; then + AC_DEFINE(MOZ_ENABLE_GCONF) fi - # The GNOME component is built if gtk2, gconf and gnome-vfs - # are all available. - - if test "$MOZ_ENABLE_GTK2" -a "$MOZ_ENABLE_GCONF" && \ - (test "$MOZ_ENABLE_GNOMEVFS" || test "$MOZ_ENABLE_GIO"); then - MOZ_ENABLE_GNOME_COMPONENT=1 - else - MOZ_ENABLE_GNOME_COMPONENT= - fi - - AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT) + AC_SUBST(MOZ_ENABLE_GCONF) + AC_SUBST(MOZ_GCONF_CFLAGS) + AC_SUBST(MOZ_GCONF_LIBS) fi -AC_SUBST(MOZ_ENABLE_GNOMEUI) -AC_SUBST(MOZ_GNOMEUI_CFLAGS) -AC_SUBST(MOZ_GNOMEUI_LIBS) - -dnl ======================================================== -dnl = dbus support -dnl ======================================================== - -if test "$MOZ_ENABLE_GTK2" || test "$MOZ_ENABLE_QT" -then - MOZ_ENABLE_DBUS=1 - - MOZ_ARG_DISABLE_BOOL(dbus, - [ --disable-dbus Disable dbus support ], - MOZ_ENABLE_DBUS=, - MOZ_ENABLE_DBUS=1) - - if test "$MOZ_ENABLE_DBUS" - then - PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1 >= $DBUS_VERSION) - AC_DEFINE(MOZ_ENABLE_DBUS) - fi -fi -AC_SUBST(MOZ_ENABLE_DBUS) -AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) -AC_SUBST(MOZ_DBUS_GLIB_LIBS) dnl ======================================================== dnl = libnotify support @@ -5275,6 +5214,82 @@ AC_SUBST(MOZ_ENABLE_LIBNOTIFY) AC_SUBST(MOZ_LIBNOTIFY_CFLAGS) AC_SUBST(MOZ_LIBNOTIFY_LIBS) +dnl ======================================================== +dnl = GNOME component (mozgnome) +dnl ======================================================== + +# The GNOME component is built if one of +# gnome-vfs, gio, gconf or libnotify is available. +if test "$MOZ_ENABLE_GCONF" || \ + test "$MOZ_ENABLE_GNOMEVFS" || \ + test "$MOZ_ENABLE_GIO" || \ + test "$MOZ_ENABLE_LIBNOTIFY"; then + MOZ_ENABLE_GNOME_COMPONENT=1 +else + MOZ_ENABLE_GNOME_COMPONENT= +fi +AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT) + +dnl ======================================================== +dnl = libgnomeui support module +dnl ======================================================== + +if test "$MOZ_ENABLE_GTK2" +then + MOZ_ENABLE_GNOMEUI=1 + + MOZ_ARG_DISABLE_BOOL(gnomeui, + [ --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) ], + MOZ_ENABLE_GNOMEUI=, + MOZ_ENABLE_GNOMEUI=force) + + if test "$MOZ_ENABLE_GNOMEUI" + then + PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION, + [ + MOZ_GNOMEUI_LIBS=`echo $MOZ_GNOMEUI_LIBS | sed 's/-llinc\>//'` + MOZ_ENABLE_GNOMEUI=1 + ],[ + if test "$MOZ_ENABLE_GNOMEUI" = "force" + then + AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION]) + fi + MOZ_ENABLE_GNOMEUI= + ]) + fi + + if test "$MOZ_ENABLE_GNOMEUI"; then + AC_DEFINE(MOZ_ENABLE_GNOMEUI) + fi +fi + +AC_SUBST(MOZ_ENABLE_GNOMEUI) +AC_SUBST(MOZ_GNOMEUI_CFLAGS) +AC_SUBST(MOZ_GNOMEUI_LIBS) + +dnl ======================================================== +dnl = dbus support +dnl ======================================================== + +if test "$MOZ_ENABLE_GTK2" || test "$MOZ_ENABLE_QT" +then + MOZ_ENABLE_DBUS=1 + + MOZ_ARG_DISABLE_BOOL(dbus, + [ --disable-dbus Disable dbus support ], + MOZ_ENABLE_DBUS=, + MOZ_ENABLE_DBUS=1) + + if test "$MOZ_ENABLE_DBUS" + then + PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1 >= $DBUS_VERSION) + AC_DEFINE(MOZ_ENABLE_DBUS) + fi +fi +AC_SUBST(MOZ_ENABLE_DBUS) +AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) +AC_SUBST(MOZ_DBUS_GLIB_LIBS) + dnl ======================================================== dnl = Build Personal Security Manager dnl ======================================================== diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index ace064741fb5..3dc5c1263519 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -48,11 +48,13 @@ FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 -CPPSRCS = \ - nsGConfService.cpp \ - nsGnomeModule.cpp \ - $(NULL) +CPPSRCS = nsGnomeModule.cpp +ifdef MOZ_ENABLE_GCONF +CPPSRCS += \ + nsGConfService.cpp \ + $(NULL) +endif ifdef MOZ_ENABLE_GNOMEVFS CPPSRCS += \ diff --git a/toolkit/system/gnome/nsGnomeModule.cpp b/toolkit/system/gnome/nsGnomeModule.cpp index a248e353524b..dd3d9cb1053e 100644 --- a/toolkit/system/gnome/nsGnomeModule.cpp +++ b/toolkit/system/gnome/nsGnomeModule.cpp @@ -46,7 +46,9 @@ #include "nsAlertsService.h" #endif +#ifdef MOZ_ENABLE_GCONF NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGConfService, Init) +#endif #ifdef MOZ_ENABLE_GNOMEVFS NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) #endif @@ -58,10 +60,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init) #endif static const nsModuleComponentInfo components[] = { +#ifdef MOZ_ENABLE_GCONF { "GConf Service", NS_GCONFSERVICE_CID, NS_GCONFSERVICE_CONTRACTID, nsGConfServiceConstructor }, +#endif #ifdef MOZ_ENABLE_GNOMEVFS { "GnomeVFS Service", NS_GNOMEVFSSERVICE_CID,