2006-10-17 Havoc Pennington <hp@redhat.com>

	* configure.in (CPPFLAGS): don't do -DDBUS_API_SUBJECT_TO_CHANGE here

	* dbus/dbus.h: drop the DBUS_API_SUBJECT_TO_CHANGE requirement,
	since realistically it doesn't look like we'll be changing it
	anymore.

diff --git a/ChangeLog b/ChangeLog
index 718208903d3e538462e4f8acd40c7e0e8ea21b32..1efc6a7dfc2853295459255fd6f42ed2a38b1366 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * configure.in (CPPFLAGS): don't do -DDBUS_API_SUBJECT_TO_CHANGE here
+
+       * dbus/dbus.h: drop the DBUS_API_SUBJECT_TO_CHANGE requirement,
+       since realistically it doesn't look like we'll be changing it
+       anymore.
+
 2006-10-17  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-internals.c (_dbus_warn_check_failed): new function to

diff --git a/configure.in b/configure.in
index 73fe6d8d8872a3eee11d295e21a355eb33adcc6b..c770dae1433ab7aa8cacf1d5c42a9808eda21e7a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -246,8 +246,6 @@ esac
 AM_PROG_LIBTOOL
 
 changequote(,)dnl
-# let ourselves use our own unstable API
-CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS"
 # compress spaces in flags
 CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
 CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'`

diff --git a/dbus/dbus.h b/dbus/dbus.h
index 4e11f7b871656f99e98fa294340b01775dae2fe1..ac1287e8797fccfc671817c5b32fa41b032836fc 100644 (file)
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -26,10 +26,6 @@
 
 #define DBUS_INSIDE_DBUS_H 1
 
-#ifndef DBUS_API_SUBJECT_TO_CHANGE
-#error "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your understanding that D-Bus hasn't reached 1.0 and is subject to protocol and API churn. See the README for a full explanation."
-#endif
-
 #include <dbus/dbus-arch-deps.h>
 #include <dbus/dbus-address.h>
 #include <dbus/dbus-bus.h>