Set debug default to "minimum", which turns off G_ENABLE_DEBUG (and the

2001-11-08  Alex Graveley  <alex@ximian.com>

	* configure.in (debug_default): Set debug default to "minimum",
	which turns off G_ENABLE_DEBUG (and the ptrace magic) by default.
	To turn back on for a debugging environment, use --enable-debug.

	* src/libsoup/soup-socket-unix.c (SOUP_PTRACE_DETACH): Wrap
	SOUP_PTRACE defines in check for G_ENABLE_DEBUG.

diff --git a/ChangeLog b/ChangeLog
index 117af97..62b94a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-11-08  Alex Graveley  <alex@ximian.com>
 
+       * configure.in (debug_default): Set debug default to "minimum",
+       which turns off G_ENABLE_DEBUG (and the ptrace magic) by default.
+       To turn back on for a debugging environment, use --enable-debug.
+
+       * src/libsoup/soup-socket-unix.c (SOUP_PTRACE_DETACH): Wrap
+       SOUP_PTRACE defines in check for G_ENABLE_DEBUG.
+
+2001-11-08  Alex Graveley  <alex@ximian.com>
+
        * src/libsoup/soup-socks.c (socks_data_free): Add cleanup function
        to avoid leaving context/address references around.
        (WSHORT): Use memcpy.

diff --git a/configure.in b/configure.in
index d94ac32..a51cc2a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,12 +29,7 @@ dnl ***************************
 dnl *** Set debugging flags ***
 dnl ***************************
 
-# Figure out debugging default, prior to $ac_help setup
-if test `expr $SOUP_REVISION \% 2` = 1 ; then
-       debug_default=yes
-else
-       debug_default=minimum
-fi
+debug_default=minimum
 
 # Declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug, 

diff --git a/libsoup/soup-socket-unix.c b/libsoup/soup-socket-unix.c
index 0b15c47..cb7601e 100644 (file)
--- a/libsoup/soup-socket-unix.c
+++ b/libsoup/soup-socket-unix.c
@@ -43,7 +43,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
-#include <sys/ptrace.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/utsname.h>
@@ -57,14 +56,17 @@
 #include <sys/sockio.h>
 #endif
 
-#ifndef PTRACE_ATTACH
-#  ifdef PT_ATTACH
-#    define SOUP_PTRACE_ATTACH PT_ATTACH
-#    define SOUP_PTRACE_DETACH PT_DETACH
+#ifdef G_ENABLE_DEBUG
+#  include <sys/ptrace.h>
+#  ifndef PTRACE_ATTACH
+#    ifdef PT_ATTACH
+#      define SOUP_PTRACE_ATTACH PT_ATTACH
+#      define SOUP_PTRACE_DETACH PT_DETACH
+#    endif
+#  else
+#    define SOUP_PTRACE_ATTACH PTRACE_ATTACH
+#    define SOUP_PTRACE_DETACH PTRACE_DETACH
 #  endif
-#else
-#  define SOUP_PTRACE_ATTACH PTRACE_ATTACH
-#  define SOUP_PTRACE_DETACH PTRACE_DETACH
 #endif
 
 #ifndef socklen_t