Followup fix for Bug 385280. should send proxy settings to the breakpad...

Followup fix for Bug 385280. should send proxy settings to the breakpad reporter. Add the check on whether gconf library exists. r=ted.mielczarek,a=beltzner.

config/autoconf.mk.in

@@ -249,6 +249,7 @@ MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STARTUP_NOTIFICATION_LIBS@
 MOZ_GNOMEVFS_CFLAGS = @MOZ_GNOMEVFS_CFLAGS@
 MOZ_GNOMEVFS_LIBS = @MOZ_GNOMEVFS_LIBS@
 
+MOZ_ENABLE_GCONF = @MOZ_ENABLE_GCONF@
 MOZ_GCONF_CFLAGS = @MOZ_GCONF_CFLAGS@
 MOZ_GCONF_LIBS = @MOZ_GCONF_LIBS@
 

configure.in

@@ -4988,6 +4988,11 @@ then
         ])
     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)
 

toolkit/crashreporter/client/Makefile.in

@@ -83,8 +83,12 @@ LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
   $(NULL)
 LOCAL_INCLUDES += -I$(srcdir)
-OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GCONF_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
-OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GCONF_LIBS) $(MOZ_GTHREAD_LIBS)
+OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
+OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)
+ifdef MOZ_ENABLE_GCONF
+OS_CXXFLAGS += $(MOZ_GCONF_CFLAGS)
+OS_LIBS += $(MOZ_GCONF_LIBS)
+endif
 CPPSRCS += http_upload.cc
 FORCE_USE_PIC=1
 endif
@@ -95,8 +99,12 @@ LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \
   $(NULL)
 LOCAL_INCLUDES += -I$(srcdir)
-OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GCONF_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
-OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GCONF_LIBS) $(MOZ_GTHREAD_LIBS)
+OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
+OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)
+ifdef MOZ_ENABLE_GCONF
+OS_CXXFLAGS += $(MOZ_GCONF_CFLAGS)
+OS_LIBS += $(MOZ_GCONF_LIBS)
+endif
 CPPSRCS += http_upload.cc
 FORCE_USE_PIC=1
 endif

toolkit/crashreporter/client/crashreporter_linux.cpp

@@ -50,7 +50,10 @@
 
 #include <signal.h>
 
+#ifdef MOZ_ENABLE_GCONF
 #include <gconf/gconf-client.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <string.h>
@@ -96,8 +99,6 @@ static void* gnomeuiLib = NULL;
 
 static const char kIniFile[] = "crashreporter.ini";
 
-#define HTTP_PROXY_DIR "/system/http_proxy"
-
 static void LoadSettings()
 {
   StringTable settings;
@@ -193,6 +194,9 @@ static gboolean ReportCompleted(gpointer success)
   return FALSE;
 }
 
+#ifdef MOZ_ENABLE_GCONF
+#define HTTP_PROXY_DIR "/system/http_proxy"
+
 static void LoadProxyinfo()
 {
   GConfClient *conf = gconf_client_get_default();
@@ -237,11 +241,16 @@ static void LoadProxyinfo()
 
   g_object_unref(conf);
 }
+#endif
 
 static gpointer SendThread(gpointer args)
 {
   string response, error;
+
+#ifdef MOZ_ENABLE_GCONF
   LoadProxyinfo();
+#endif
+
   bool success = google_breakpad::HTTPUpload::SendRequest
     (gSendURL,
      gQueryParameters,