Check for bt-dbus.h if requested. Check bluez only if requested.

diff --git a/configure.ac b/configure.ac
index 1d60243ffc15360e4d032646948b2ceba1cdbf60..67d6854c7df1d0fab6055a286c6a969a297bc1dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ if test "x$enable_itbtdbus" = "xno" ; then
   enable_btdbus=yes
 else
   WITH_HILDON_DBUS_BT=yes
+  AC_CHECK_HEADERS([bt-dbus.h], [ac_cv_btdbus_h=yes])
   AC_DEFINE([WITH_HILDON_DBUS_BT], 1, [IT D-Bus bluetooth])
 fi
 
@@ -77,6 +78,9 @@ if test "x$enable_btdbus" = "xno" ; then
   WITH_BLUEZ_DBUS_BT=no
 else
   WITH_BLUEZ_DBUS_BT=yes
+  PKG_CHECK_MODULES(BLUEZ, bluez)
+  AC_SUBST(BLUEZ_LIBS)
+  AC_SUBST(BLUEZ_CFLAGS)
   AC_DEFINE([WITH_BLUEZ_DBUS_BT], 1, [bluez D-Bus bluetooth])
 fi
 
@@ -133,10 +137,6 @@ fi
 AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes")
 AM_CONDITIONAL(WITH_OSSO, test "x$HAVE_OSSO" = "xyes")
 
-PKG_CHECK_MODULES(BLUEZ, bluez)
-AC_SUBST(BLUEZ_LIBS)
-AC_SUBST(BLUEZ_CFLAGS)
-
 AC_CHECK_HEADERS([gps.h], [ac_cv_gps_h=yes])
 AC_CHECK_LIB(gps, gps_open,[ac_cv_libgps=yes] )
 if test "x$ac_cv_libgps" = xyes; then