Merge branch 'devel' into upstream

Change-Id: I31a1d5e6866681a95198a3802d5565452c1e2347
Signed-off-by: Imran Zaman <imran.zaman@linux.intel.com>

diff --cc configure.ac
index c7b43bf,fa6e07f..0ac535c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -95,12 -95,10 +95,11 @@@ elif test "x$enable_dbus_type" = "xsyst
          DBUS_SERVICES_DIR="`pkg-config --variable system_bus_services_dir dbus-1`"
      fi
  fi
- if test "x$enable_dbus_type" != "xp2p" ; then
-     if test "x$enable_distcheck" = "xyes" ; then
-         DBUS_INTERFACES_DIR="${datadir}/dbus-1/interfaces"
-     else
-         DBUS_INTERFACES_DIR="`pkg-config --variable interfaces_dir dbus-1`"
-     fi
++
+ if test "x$enable_distcheck" = "xyes" ; then
+     DBUS_INTERFACES_DIR="${datadir}/dbus-1/interfaces"
+ else
+     DBUS_INTERFACES_DIR="`pkg-config --variable interfaces_dir dbus-1`"
  fi
  
  AC_ARG_ENABLE(keychain,