* 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

diff --git a/ChangeLog b/ChangeLog
index ae36099131d34712927af6ebdc2251e4c6dd4526..ec74195066b523ec8803caa9497627effedbe68a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-02  John (J5) Palmieir  <johnp@redhat.com>
+
+       * 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
+
 2006-10-02  John (J5) Palmieir  <johnp@redhat.com>
 
        * dbus/dbus-sysdeps-util-unix.c (dirent_buf_size): Add check for

diff --git a/configure.in b/configure.in
index 1be4a96c746e10918220728c62b7b472d8b9ea45..b3a50ecb84db6aa548ba1e0c206bc56f5b020aad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(dbus/dbus.h)
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(dbus, 0.94)
+AM_INIT_AUTOMAKE(dbus, 0.93.1)
 
 AM_CONFIG_HEADER(config.h)
 

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 22ef99691128e558ec6ea099cf8eb8bbfa173af5..ce565884fc8e7bbf81e822006842b9cb86191483 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -2127,7 +2127,6 @@ _dbus_set_fd_nonblocking (int             fd,
   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 @@ _dbus_print_backtrace (void)
   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()).

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index b7040abf3bebdf14f890cee3b1d4039ffb5abf5d..d1a4861746ba42b78bbc979afaa3c002052ae410 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -53,7 +53,7 @@ _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache);
  * @addtogroup DBusInternalsUtils
  * @{
  */
-#ifndef DBUS_DISABLE_ASSERT
+
 /**
  * Aborts the program with SIGABRT (dumping core).
  */
@@ -75,7 +75,6 @@ _dbus_abort (void)
   abort ();
   _dbus_exit (1); /* in case someone manages to ignore SIGABRT ? */
 }
-#endif
 
 /**
  * Wrapper for setenv(). If the value is #NULL, unsets

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e53b47a9d0a7d8a4970d9fd9cf11c67ad121a943..613b715889a21b0c7718fc581e91949539f2e483 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -16,7 +16,8 @@ dbus_monitor_SOURCES=                         \
 
 dbus_launch_SOURCES=                           \
        dbus-launch.c                           \
-       dbus-launch-x11.c
+       dbus-launch-x11.c                       \
+       dbus-launch.h
 
 dbus_cleanup_sockets_SOURCES=                  \
        dbus-cleanup-sockets.c