Index: configure.in
===================================================================
--- configure.in	(revision 2429)
+++ configure.in	(working copy)
@@ -76,25 +76,32 @@
 AC_CHECK_HEADERS([libelf.h],[],[AC_MSG_ERROR([libelf.h not found.])])
 AC_CHECK_HEADERS([gelf.h],[],[AC_MSG_ERROR([gelf.h not found.])])
 
-AC_CONFIG_SUBDIRS(google-breakpad)
-GOOGLE_BREAKPAD_SUPPORTED_OS="no"
-case $target_os in
-    solaris*) ;;
-    linux*)
-       GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
-esac
+AC_ARG_ENABLE(google-breakpad,
+  AC_HELP_STRING([--disable-google-breakpad],
+      [compile without google breakpad]),
+      enable_google_breakpad=$enableval, enable_google_breakpad=yes)
 
-GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
-case $target_cpu in
-    *86)
-       GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
-esac
+if test x$enable_google_breakpad = xyes; then
+  GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+  case $target_os in
+      solaris*) ;;
+      linux*)
+         GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
+  esac
 
-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
-	if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
-		echo "OS and CPU supported: enabling google-breakpad"
-		AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
-		use_google_breakpad=yes
+  GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
+  case $target_cpu in
+      *86)
+         GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+  esac
+
+	if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+		if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+			echo "OS and CPU supported: enabling google-breakpad"
+			AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
+			AC_CONFIG_SUBDIRS(google-breakpad)
+			use_google_breakpad=yes
+		fi
 	fi
 fi
 
Index: gnome-breakpad/gnome-breakpad.cc
===================================================================
--- gnome-breakpad/gnome-breakpad.cc	(revision 2429)
+++ gnome-breakpad/gnome-breakpad.cc	(working copy)
@@ -24,9 +24,11 @@
 #include <config.h>
 
 
-#include "client/linux/handler/exception_handler.h"
+#ifdef ENABLE_GOOGLE_BREAKPAD
+  #include "client/linux/handler/exception_handler.h"
 
-using namespace google_breakpad;
+  using namespace google_breakpad;
+#endif
 
 extern "C" int gtk_module_init (int *argc, char** argv[]);
 static bool    run_bug_buddy   (const gchar *appname, pid_t pid, const gchar *minidump_path);
