Imported Upstream version 1.7.6upstream/1.7.6

1 files changed, 181 insertions, 300 deletions

diff --git a/configure b/configure
index 0e88f2a7..56ef061b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dbus 1.7.4.
+# Generated by GNU Autoconf 2.69 for dbus 1.7.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dbus'
 PACKAGE_TARNAME='dbus'
-PACKAGE_VERSION='1.7.4'
-PACKAGE_STRING='dbus 1.7.4'
+PACKAGE_VERSION='1.7.6'
+PACKAGE_STRING='dbus 1.7.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus'
 PACKAGE_URL=''
 
@@ -642,7 +642,6 @@ DBUS_SESSION_SOCKET_DIR
 TEST_LISTEN
 TEST_SOCKET_DIR
 TEST_LAUNCH_HELPER_BINARY
-TEST_BUS_BINARY
 DBUS_TEST_EXEC
 DBUS_TEST_DATA
 DBUS_LIBEXECDIR
@@ -711,8 +710,6 @@ DBUS_BUS_ENABLE_KQUEUE_FALSE
 DBUS_BUS_ENABLE_KQUEUE_TRUE
 HAVE_LINUX_EPOLL_FALSE
 HAVE_LINUX_EPOLL_TRUE
-DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE
-DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE
 DBUS_BUS_ENABLE_INOTIFY_FALSE
 DBUS_BUS_ENABLE_INOTIFY_TRUE
 HAVE_SELINUX_FALSE
@@ -723,7 +720,6 @@ XML_CFLAGS
 DBUS_PATH_OR_ABSTRACT
 DBUS_INT16_TYPE
 DBUS_INT32_TYPE
-DBUS_HAVE_INT64
 DBUS_UINT64_CONSTANT
 DBUS_INT64_CONSTANT
 DBUS_INT64_TYPE
@@ -743,14 +739,14 @@ DBUS_WITH_GLIB_FALSE
 DBUS_WITH_GLIB_TRUE
 DBUS_ENABLE_MODULAR_TESTS_FALSE
 DBUS_ENABLE_MODULAR_TESTS_TRUE
+DBUS_WITH_DBUS_GLIB_FALSE
+DBUS_WITH_DBUS_GLIB_TRUE
 DBUS_GLIB_LIBS
 DBUS_GLIB_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 DBUS_ENABLE_EMBEDDED_TESTS_FALSE
 DBUS_ENABLE_EMBEDDED_TESTS_TRUE
-DBUS_BUILD_TESTS_FALSE
-DBUS_BUILD_TESTS_TRUE
 DBUS_STATIC_BUILD_CPPFLAGS
 DBUS_CYGWIN_FALSE
 DBUS_CYGWIN_TRUE
@@ -920,11 +916,9 @@ enable_doxygen_docs
 enable_abstract_sockets
 enable_selinux
 enable_libaudit
-enable_dnotify
 enable_inotify
 enable_kqueue
 enable_console_owner_file
-enable_userdb_cache
 enable_launchd
 enable_systemd
 with_init_scripts
@@ -940,8 +934,8 @@ with_dbus_daemondir
 enable_embedded_tests
 enable_modular_tests
 enable_tests
+with_dbus_glib
 enable_installed_tests
-with_64_bit
 enable_epoll
 with_valgrind
 enable_x11_autolaunch
@@ -1518,7 +1512,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dbus 1.7.4 to adapt to many kinds of systems.
+\`configure' configures dbus 1.7.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1592,7 +1586,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dbus 1.7.4:";;
+     short | recursive ) echo "Configuration of dbus 1.7.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1630,12 +1624,10 @@ Optional Features:
                           use abstract socket namespace (linux only)
   --enable-selinux        build with SELinux support
   --enable-libaudit       build audit daemon support for SELinux
-  --enable-dnotify        build with dnotify support (linux only)
   --enable-inotify        build with inotify support (linux only)
   --enable-kqueue         build with kqueue support
   --enable-console-owner-file
                           enable console owner file
-  --enable-userdb-cache   build with userdb-cache support
   --enable-launchd        build with launchd auto-launch support
   --enable-systemd        build with systemd at_console support
   --enable-embedded-tests enable unit test code in the library and binaries
@@ -1679,8 +1671,7 @@ Optional Packages:
   --with-dbus-user=<user> User for running the DBUS daemon (messagebus)
   --with-dbus-daemondir=dirname
                           Directory for installing the DBUS daemon
-  --without-64-bit        If you have to use this option, please report it as
-                          a bug
+  --with-dbus-glib        Use dbus-glib for regression tests
   --with-valgrind         Add instrumentation to help valgrind to understand
                           our allocator
   --with-x                use the X Window System
@@ -1792,7 +1783,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dbus configure 1.7.4
+dbus configure 1.7.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2511,7 +2502,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dbus $as_me 1.7.4, which was
+It was created by dbus $as_me 1.7.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2965,7 +2956,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3451,7 +3442,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dbus'
- VERSION='1.7.4'
+ VERSION='1.7.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3618,6 +3609,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 GETTEXT_PACKAGE=dbus-1
 
@@ -3722,8 +3754,8 @@ LT_AGE=8
 
 DBUS_MAJOR_VERSION=1
 DBUS_MINOR_VERSION=7
-DBUS_MICRO_VERSION=4
-DBUS_VERSION=1.7.4
+DBUS_MICRO_VERSION=6
+DBUS_VERSION=1.7.6
 
 
 
@@ -4518,6 +4550,65 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4710,131 +4801,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -16788,13 +16754,6 @@ else
   enable_libaudit=auto
 fi
 
-# Check whether --enable-dnotify was given.
-if test "${enable_dnotify+set}" = set; then :
-  enableval=$enable_dnotify; enable_dnotify=$enableval
-else
-  enable_dnotify=auto
-fi
-
 # Check whether --enable-inotify was given.
 if test "${enable_inotify+set}" = set; then :
   enableval=$enable_inotify; enable_inotify=$enableval
@@ -16816,13 +16775,6 @@ else
   enable_console_owner_file=auto
 fi
 
-# Check whether --enable-userdb-cache was given.
-if test "${enable_userdb_cache+set}" = set; then :
-  enableval=$enable_userdb_cache; enable_userdb_cache=$enableval
-else
-  enable_userdb_cache=yes
-fi
-
 # Check whether --enable-launchd was given.
 if test "${enable_launchd+set}" = set; then :
   enableval=$enable_launchd; enable_launchd=$enableval
@@ -16931,16 +16883,7 @@ fi
 
 
 # DBUS_ENABLE_EMBEDDED_TESTS controls unit tests built in to .c files
-# and also some stuff in the test/ subdir. DBUS_BUILD_TESTS was an older
-# name for this.
- if test "x$enable_embedded_tests" = xyes; then
-  DBUS_BUILD_TESTS_TRUE=
-  DBUS_BUILD_TESTS_FALSE='#'
-else
-  DBUS_BUILD_TESTS_TRUE='#'
-  DBUS_BUILD_TESTS_FALSE=
-fi
-
+# and also some stuff in the test/ subdir.
  if test "x$enable_embedded_tests" = xyes; then
   DBUS_ENABLE_EMBEDDED_TESTS_TRUE=
   DBUS_ENABLE_EMBEDDED_TESTS_FALSE='#'
@@ -16953,9 +16896,6 @@ if test "x$enable_embedded_tests" = xyes; then
 
 $as_echo "#define DBUS_ENABLE_EMBEDDED_TESTS 1" >>confdefs.h
 
-
-$as_echo "#define DBUS_BUILD_TESTS 1" >>confdefs.h
-
 fi
 
 # DBUS_ENABLE_MODULAR_TESTS controls tests that work based on public API.
@@ -16972,7 +16912,8 @@ $as_echo "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_32" >>confdefs.h
 
 with_glib=yes
 
-if test "x$enable_modular_tests" != xno; then
+if test "x$enable_modular_tests" != xno; then :
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
@@ -17052,7 +16993,22 @@ else
 $as_echo "yes" >&6; }
 	:
 fi
-  # If dbus-gmain.[ch] returned to libdbus then we wouldn't need this
+
+else
+  with_glib=no
+fi
+
+# Not required, because we can use internal APIs (but that makes the
+# "installable tests" less useful as integration tests)
+
+# Check whether --with-dbus_glib was given.
+if test "${with_dbus_glib+set}" = set; then :
+  withval=$with_dbus_glib;
+else
+  with_dbus_glib=auto
+fi
+
+if test "x$with_dbus_glib" != xno; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5
@@ -17110,21 +17066,17 @@ fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                if test "x$enable_modular_tests" = xyes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib" >&5
-$as_echo "$as_me: Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib" >&6;}
-      as_fn_error $? "$DBUS_GLIB_ERRORS" "$LINENO" 5
-    else # assumed to be "auto"
-      with_glib=no
-    fi
+                if test "x$with_dbus_glib" = xyes; then :
+        as_fn_error $? "$DBUS_GLIB_ERRORS" "$LINENO" 5
+else
+        with_dbus_glib=no
+fi
 elif test $pkg_failed = untried; then
-	if test "x$enable_modular_tests" = xyes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib" >&5
-$as_echo "$as_me: Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires dbus-glib" >&6;}
-      as_fn_error $? "$DBUS_GLIB_ERRORS" "$LINENO" 5
-    else # assumed to be "auto"
-      with_glib=no
-    fi
+	if test "x$with_dbus_glib" = xyes; then :
+        as_fn_error $? "$DBUS_GLIB_ERRORS" "$LINENO" 5
+else
+        with_dbus_glib=no
+fi
 else
 	DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
 	DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
@@ -17133,6 +17085,15 @@ $as_echo "yes" >&6; }
 	:
 fi
 fi
+ if test "x$with_dbus_glib" != xno; then
+  DBUS_WITH_DBUS_GLIB_TRUE=
+  DBUS_WITH_DBUS_GLIB_FALSE='#'
+else
+  DBUS_WITH_DBUS_GLIB_TRUE='#'
+  DBUS_WITH_DBUS_GLIB_FALSE=
+fi
+
+
 if test "x$enable_modular_tests" != xno; then
 
 $as_echo "#define DBUS_ENABLE_MODULAR_TESTS 1" >>confdefs.h
@@ -17729,6 +17690,11 @@ $as_echo "#define DBUS_DISABLE_ASSERT 1" >>confdefs.h
 
     DISABLE_UNUSED_WARNINGS="unused-label"
     R_DYNAMIC_LDFLAG=""
+    if test x$enable_embedded_tests = xyes; then
+        DISABLE_UNUSED_WARNINGS="$DISABLE_UNUSED_WARNINGS \
+                unused-but-set-variable unused-variable \
+                unused-function"
+    fi
 else
     # -rdynamic is needed for glibc's backtrace_symbols to work.
     # No clue how much overhead this adds, but it's useful
@@ -17754,11 +17720,7 @@ $as_echo "#define G_DISABLE_CHECKS 1" >>confdefs.h
     DISABLE_UNUSED_WARNINGS="unused-label"
 fi
 
-if test x$enable_userdb_cache = xyes; then
 
-$as_echo "#define DBUS_ENABLE_USERDB_CACHE 1" >>confdefs.h
-
-fi
 
 if test x$enable_compiler_coverage = xyes; then
      ## so that config.h changes when you toggle gcov support
@@ -18038,15 +18000,6 @@ _ACEOF
 
 
 
-
-# Check whether --with-64-bit was given.
-if test "${with_64_bit+set}" = set; then :
-  withval=$with_64_bit;
-else
-  with_64_bit=yes
-fi
-
-
 ### See what our 64 bit type is called
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking 64-bit integer type" >&5
 $as_echo_n "checking 64-bit integer type... " >&6; }
@@ -18085,34 +18038,18 @@ $ac_cv_sizeof___int64)
   ;;
 esac
 
-if test "x$with_64_bit" = xno; then :
-
-        DBUS_INT64_TYPE="no_int64_type_detected"
-        DBUS_HAVE_INT64=0
-        DBUS_INT64_CONSTANT=
-        DBUS_UINT64_CONSTANT=
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled via --without-64-bit" >&5
-$as_echo "disabled via --without-64-bit" >&6; }
-
-elif   test -z "$dbusint64"; then :
+if test -z "$dbusint64"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
   as_fn_error $? "Could not find a 64-bit integer type.
 
 Please report a bug here with details of your platform and compiler:
 
-    http://bugs.freedesktop.org/enter_bug.cgi?product=DBus&component=core
-
-To compile D-Bus with all 64-bit integer types removed (not recommended), use
-the option \"--without-64-bit\".
-
-This option is likely to be removed in future, unless you report that your
-platform needs it." "$LINENO" 5
+    http://bugs.freedesktop.org/enter_bug.cgi?product=DBus&component=core" "$LINENO" 5
 
 else
 
         DBUS_INT64_TYPE="$dbusint64"
-        DBUS_HAVE_INT64=1
         DBUS_INT64_CONSTANT="$dbusint64_constant"
         DBUS_UINT64_CONSTANT="$dbusuint64_constant"
 	if test x"$dbusint64_printf_modifier" != x; then
@@ -18131,7 +18068,6 @@ fi
 
 
 
-
 ### see what 32-bit int is called
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit integer type" >&5
 $as_echo_n "checking 32-bit integer type... " >&6; }
@@ -19006,19 +18942,6 @@ fi
 done
 
 
-for ac_header in wspiapi.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "wspiapi.h" "ac_cv_header_wspiapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_wspiapi_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WSPIAPI_H 1
-_ACEOF
-
-fi
-
-done
-
-
 for ac_header in alloca.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "$ac_includes_default"
@@ -20208,32 +20131,6 @@ else
 fi
 
 
-# dnotify checks
-if test x$enable_dnotify = xno ; then
-    have_dnotify=no;
-else
-    if test x$have_inotify = xno -a x$host_os = xlinux-gnu -o x$host_os = xlinux; then
-        have_dnotify=yes;
-    else
-        have_dnotify=no;
-    fi
-fi
-
-if test x$have_dnotify = xyes; then
-
-$as_echo "#define DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1" >>confdefs.h
-
-fi
-
- if test x$have_dnotify = xyes; then
-  DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE=
-  DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE='#'
-else
-  DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE='#'
-  DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE=
-fi
-
-
 # For simplicity, we require the userland API for epoll_create1 at
 # compile-time (glibc 2.9), but we'll run on kernels that turn out
 # not to have it at runtime.
@@ -20726,6 +20623,19 @@ else
 fi
 
 
+if test "x$with_valgrind" = xauto; then :
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind >= 3.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "valgrind >= 3.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  with_valgrind=yes
+else
+  with_valgrind=no
+fi
+fi
+
 if test x$with_valgrind != xno; then
 
 pkg_failed=no
@@ -22660,11 +22570,10 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define TEST_BUS_BINARY "$DBUS_PWD/bus/dbus-daemon$EXEEXT"
+#define TEST_BUS_LAUNCH_BINARY "$DBUS_PWD/tools/dbus-launch$EXEEXT"
 _ACEOF
 
 
-
 ## Export the non-setuid external helper
 TEST_LAUNCH_HELPER_BINARY="$DBUS_PWD/bus/dbus-daemon-launch-helper-test$EXEEXT"
 
@@ -22984,14 +22893,14 @@ if test -z "${DBUS_CYGWIN_TRUE}" && test -z "${DBUS_CYGWIN_FALSE}"; then
   as_fn_error $? "conditional \"DBUS_CYGWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DBUS_BUILD_TESTS_TRUE}" && test -z "${DBUS_BUILD_TESTS_FALSE}"; then
-  as_fn_error $? "conditional \"DBUS_BUILD_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DBUS_ENABLE_EMBEDDED_TESTS_TRUE}" && test -z "${DBUS_ENABLE_EMBEDDED_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"DBUS_ENABLE_EMBEDDED_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${DBUS_WITH_DBUS_GLIB_TRUE}" && test -z "${DBUS_WITH_DBUS_GLIB_FALSE}"; then
+  as_fn_error $? "conditional \"DBUS_WITH_DBUS_GLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${DBUS_ENABLE_MODULAR_TESTS_TRUE}" && test -z "${DBUS_ENABLE_MODULAR_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"DBUS_ENABLE_MODULAR_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23013,10 +22922,6 @@ if test -z "${DBUS_BUS_ENABLE_INOTIFY_TRUE}" && test -z "${DBUS_BUS_ENABLE_INOTI
   as_fn_error $? "conditional \"DBUS_BUS_ENABLE_INOTIFY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE}" && test -z "${DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE}"; then
-  as_fn_error $? "conditional \"DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_LINUX_EPOLL_TRUE}" && test -z "${HAVE_LINUX_EPOLL_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LINUX_EPOLL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23466,7 +23371,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dbus $as_me 1.7.4, which was
+This file was extended by dbus $as_me 1.7.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23532,7 +23437,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dbus config.status 1.7.4
+dbus config.status 1.7.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25875,19 +25780,18 @@ echo "
         Building embedded tests:  ${enable_embedded_tests}
         Building modular tests:   ${enable_modular_tests}
             - with GLib:          ${with_glib}
+            - with dbus-glib:     ${with_dbus_glib}
         Building verbose mode:    ${enable_verbose_mode}
         Building assertions:      ${enable_asserts}
         Building checks:          ${enable_checks}
         Building bus stats API:   ${enable_stats}
         Building SELinux support: ${have_selinux}
         Building inotify support: ${have_inotify}
-        Building dnotify support: ${have_dnotify}
         Building kqueue support:  ${have_kqueue}
         Building systemd support: ${have_systemd}
         Building X11 code:        ${have_x11}
         Building Doxygen docs:    ${enable_doxygen_docs}
         Building XML docs:        ${enable_xml_docs}
-        Building cache support:   ${enable_userdb_cache}
         Building launchd support: ${have_launchd}
         Init scripts style:       ${with_init_scripts}
         Abstract socket names:    ${ac_cv_have_abstract_sockets}
@@ -25926,26 +25830,3 @@ fi
 if test x$enable_checks = xno; then
         echo "NOTE: building without checks for arguments passed to public API makes it harder to debug apps using D-Bus, but will slightly decrease D-Bus library size and _very_ slightly improve performance."
 fi
-
-if test "x$DBUS_HAVE_INT64" = x0; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have disabled 64-bit integers via --without-64-bit.
-
-  This removes parts of the standard D-Bus API and ABI (the 't' and 'x'
-  typecodes, the dbus_int64_t and dbus_uint64_t types, etc.) and should only be
-  used if your compiler lacks support for 64-bit integers. Please report a bug
-  with details of your platform and compiler.
-
-  This option is likely to be removed in future, unless the D-Bus developers
-  receive reports that it is still needed.
-  " >&5
-$as_echo "$as_me: WARNING: You have disabled 64-bit integers via --without-64-bit.
-
-  This removes parts of the standard D-Bus API and ABI (the 't' and 'x'
-  typecodes, the dbus_int64_t and dbus_uint64_t types, etc.) and should only be
-  used if your compiler lacks support for 64-bit integers. Please report a bug
-  with details of your platform and compiler.
-
-  This option is likely to be removed in future, unless the D-Bus developers
-  receive reports that it is still needed.
-  " >&2;}
-fi