Attempt to fix bustage when GConf/GnomeVFS libraries are not available (bug 251703). Always export the GNOME interfaces on gtk2 but only build the component when all of the prerequisites are installed. r+sr=darin.

git-svn-id: svn://10.0.0.236/trunk@159482 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/autoconf.mk.in

@@ -194,6 +194,8 @@ MOZ_GCONF_LIBS = @MOZ_GCONF_LIBS@
 MOZ_LIBGNOME_CFLAGS = @MOZ_LIBGNOME_CFLAGS@
 MOZ_LIBGNOME_LIBS = @MOZ_LIBGNOME_LIBS@
 
+MOZ_ENABLE_GNOME_COMPONENT = @MOZ_ENABLE_GNOME_COMPONENT@
+
 MOZ_INSURE = @MOZ_INSURE@
 MOZ_INSURIFYING = @MOZ_INSURIFYING@
 MOZ_INSURE_DIRS = @MOZ_INSURE_DIRS@

mozilla/configure.in

@@ -3556,6 +3556,17 @@ then
     AC_SUBST(MOZ_LIBGNOME_CFLAGS)
     AC_SUBST(MOZ_LIBGNOME_LIBS)
 
+    # The GNOME component is built if gtk2, gconf, gnome-vfs, and libgnome
+    # are all available.
+
+    if test "$MOZ_ENABLE_GTK2" -a "$MOZ_ENABLE_GCONF" -a \
+            "$MOZ_ENABLE_GNOMEVFS" -a "$MOZ_ENABLE_LIBGNOME"; then
+      MOZ_ENABLE_GNOME_COMPONENT=1
+    else
+      MOZ_ENABLE_GNOME_COMPONENT=
+    fi
+
+    AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
 fi
 
 dnl ========================================================

mozilla/toolkit/components/gnome/Makefile.in

@@ -43,6 +43,18 @@ VPATH	  = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mozgnome
+
+XPIDLSRCS = \
+	nsIGConfService.idl \
+	nsIGnomeVFSService.idl \
+	$(NULL)
+
+
+# We always export these interfaces if we're building for gtk2, but
+# only compile the component if the required libraries are available.
+
+ifdef MOZ_ENABLE_GNOME_COMPONENT
+
 LIBRARY_NAME	= mozgnome
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
@@ -53,11 +65,6 @@ REQUIRES = \
 	necko \
 	$(NULL)
 
-XPIDLSRCS = \
-	nsIGConfService.idl \
-	nsIGnomeVFSService.idl \
-	$(NULL)
-
 CPPSRCS = \
 	nsGConfService.cpp \
 	nsGnomeVFSService.cpp \
@@ -71,6 +78,8 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_LIBGNOME_LIBS) \
 		$(NULL)
 
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \