From 6bf0245055a83383578042f6ea69bc1bbd349b80 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Thu, 20 Sep 2007 09:18:51 +0300 Subject: [PATCH] Check for bt-dbus.h if requested. Check bluez only if requested. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1d60243..67d6854 100644 --- 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 -- 2.39.5