* acconfig.h

* configure.in
* src/crash.c
	enable crash dialog on compilation time
	(--enable-crash-dialog configure option)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2b3d366b7d1448a4ce074bdb1c1ece11f4594d8b..7c537d66e2a5a1a5fc72489e6d46b18c72e32948 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-08-30 [alfons]    0.8.2claws13
+
+       * acconfig.h
+       * configure.in
+       * src/crash.c
+               enable crash dialog on compilation time
+               (--enable-crash-dialog configure option)
+
 2002-08-30 [alfons]    0.8.2claws12
 
        * AUTHORS

diff --git a/acconfig.h b/acconfig.h
index 64ae2dedda96d281d554d88e4618bd8c2c1734b1..68c39b1584bbc205fadcbdc0be0fccc87bcfa4f0 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -39,8 +39,8 @@
 /* Used to test for a u32 typedef */
 #undef HAVE_U32_TYPEDEF
 
-/* If gdb is available */
-#undef HAVE_GDB
+/* Pop up crash dialog */
+#undef CRASH_DIALOG 
 
 #undef CLAWS
 

diff --git a/configure.in b/configure.in
index 4ec671905df3dc2f2df3f219180ec956e0d6a8bd..513cef48e303f165a7c41f5c7084d22942da9469 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws13
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -318,10 +318,18 @@ fi
 CFLAGS="$CFLAGS_SAVE"
 LDFLAGS="$LDFLAGS_SAVE"
 
+dnl want crash dialog
+AC_ARG_ENABLE(crash-dialog,
+       [  --enable-crash-dialog   Enable crash dialog [default=no]],
+       [ac_cv_enable_crash_dialog=$enableval], [ac_cv_enable_crash_dialog=no])
+if test $ac_cv_enable_crash_dialog = yes; then
 dnl check if GDB is somewhere
-AC_CHECK_PROG(HAVE_GDB, gdb, yes, no)
-if test $HAVE_GDB = yes; then
-       AC_DEFINE(HAVE_GDB)
+       AC_CHECK_PROG(ac_cv_enable_crash_dialog, gdb, yes, no)
+       AC_MSG_CHECKING([whether to use crash dialog])
+       if test $ac_cv_enable_crash_dialog = yes; then
+               AC_DEFINE(CRASH_DIALOG)
+       fi
+       AC_MSG_RESULT($ac_cv_enable_crash_dialog)
 fi
 
 dnl Checks for header files.
@@ -405,6 +413,7 @@ echo "compface      : $ac_cv_enable_compface"
 echo "libjconv      : $ac_cv_enable_jconv"
 echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
+echo "Crash dialog  : $ac_cv_enable_crash_dialog"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""

diff --git a/src/crash.c b/src/crash.c
index 157185f8a1224c0f7c65ab84cbd49d4aad9a8f26..134e5727cf54bdb6acf1f2d5650d7a651bad44ce 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -86,7 +86,7 @@ static const gchar *DEBUG_SCRIPT = "bt\nkill\nq";
  */
 void crash_install_handlers(void)
 {
-#if HAVE_GDB
+#if CRASH_DIALOG 
        sigset_t mask;
 
        if (!is_crash_dialog_allowed()) return;
@@ -114,7 +114,7 @@ void crash_install_handlers(void)
 #endif
 
        sigprocmask(SIG_UNBLOCK, &mask, 0);
-#endif /* HAVE_GDB */  
+#endif /* CRASH_DIALOG */      
 }
 
 /***/
@@ -124,7 +124,7 @@ void crash_install_handlers(void)
  */
 void crash_main(const char *arg) 
 {
-#if HAVE_GDB
+#if CRASH_DIALOG 
        gchar *text;
        gchar **tokens;
        unsigned long pid;
@@ -151,7 +151,7 @@ void crash_main(const char *arg)
        g_string_free(output, TRUE);
        g_free(text);
        g_strfreev(tokens);
-#endif /* HAVE_GDB */  
+#endif /* CRASH_DIALOG */      
 }
 
 /*!