From 8391a7f472333a9d9340be7d1045f1fbfb0537ce Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com" <bryner%brianryner.com>
Date: Thu, 27 Jul 2006 14:42:24 +0000
Subject: [PATCH] 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.

---
 toolkit/system/gnome/Makefile.in | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
index a1b6c91813d..85adcd4ab42 100644
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/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 += \