dbus/dbus dbus-sysdeps-unix.c,1.9,1.10 dbus-sysdeps.c,1.116,1.117

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv13246/dbus

Modified Files:
	dbus-sysdeps-unix.c dbus-sysdeps.c 
Log Message:
* dbus/dbus-sysdeps.c (_dbus_abort): Remove from 
  #ifndef DBUS_DISABLE_ASSERTS macro to fix distcheck

* dbus/dbus-sysdeps-unix.c (_dbus_print_backtrace): Remove from
  #if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS)
  macro because _dbus_abort calls it

* tools/Makefile.am: Add dbus-launch.h to the source list so distcheck works



Index: dbus-sysdeps-unix.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-unix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-sysdeps-unix.c	1 Oct 2006 20:05:39 -0000	1.9
+++ dbus-sysdeps-unix.c	2 Oct 2006 18:45:27 -0000	1.10
@@ -2127,7 +2127,6 @@
   return TRUE;
 }
 
-#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS)
 /**
  * On GNU libc systems, print a crude backtrace to stderr.  On other
  * systems, print "no backtrace support" and block for possible gdb
@@ -2162,7 +2161,6 @@
   fprintf (stderr, "  D-Bus not compiled with backtrace support so unable to print a backtrace\n");
 #endif
 }
-#endif /* asserts or tests enabled */
 
 /**
  * Creates a full-duplex pipe (as in socketpair()).

Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- dbus-sysdeps.c	1 Oct 2006 17:21:03 -0000	1.116
+++ dbus-sysdeps.c	2 Oct 2006 18:45:27 -0000	1.117
@@ -53,7 +53,7 @@
  * @addtogroup DBusInternalsUtils
  * @{
  */
-#ifndef DBUS_DISABLE_ASSERT
+
 /**
  * Aborts the program with SIGABRT (dumping core).
  */
@@ -75,7 +75,6 @@
   abort ();
   _dbus_exit (1); /* in case someone manages to ignore SIGABRT ? */
 }
-#endif
 
 /**
  * Wrapper for setenv(). If the value is #NULL, unsets