Merge branch 'dbus-1.6'

This commit is contained in:
Simon McVittie 2012-07-03 19:21:00 +01:00
commit aef027e946
2 changed files with 3 additions and 3 deletions

View file

@ -127,8 +127,9 @@ AM_CONDITIONAL(DBUS_CYGWIN, test "$dbus_cygwin" = yes)
# this must come first: other options use this to set their defaults
AC_ARG_ENABLE([developer],
[AS_HELP_STRING([--enable-developer],
[set defaults to be appropriate for a D-Bus developer instead of a distribution/end-user]),
[], enable_developer=no])
[set defaults to be appropriate for a D-Bus developer instead of a distribution/end-user])],
[],
[enable_developer=no])
DBUS_STATIC_BUILD_CPPFLAGS=
if test "x$enable_shared" = xno; then

View file

@ -253,7 +253,6 @@ check_address (const char *address, DBusError *error)
int len, i;
_dbus_assert (address != NULL);
_dbus_assert (*address != '\0');
if (!dbus_parse_address (address, &entries, &len, error))
return NULL; /* not a valid address */