[kmobiletools] branches/extragear/kde3/pim/kmobiletools
Marco Gulino
marco at kmobiletools.org
Sat Jun 16 11:56:31 CEST 2007
SVN commit 676210 by gulino:
Fixing dbus flags should be BEFORE kdebluetooth checking.
M +9 -8 configure.in.in
--- branches/extragear/kde3/pim/kmobiletools/configure.in.in #676209:676210
@@ -121,6 +121,15 @@
[enable_tests=$enableval], [enable_tests=no])
AM_CONDITIONAL(compile_tests, test "x$enable_tests" = "xyes")
+#KDEBluetooth-DBUS module
+PKG_CHECK_MODULES(DBUS, "dbus-1", have_dbus=yes, have_dbus=no)
+
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+# DBUS QT BINDING ### stolen from kdebluetooth-dbus which has stolen from kpowersave and knetworkmanager :P #
+CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE"
+
+
AC_ARG_ENABLE(kdebluetooth, AC_HELP_STRING([--disable-kdebluetooth], [disable kdebluetooth integration (default: check)]),
[enable_kdebluetooth=$enableval], [enable_kdebluetooth=yes])
if test "x$enable_kdebluetooth" = "xyes"; then
@@ -136,15 +145,7 @@
fi
AC_SUBST(LIB_KBLUETOOTH)
-#KDEBluetooth-DBUS module
-PKG_CHECK_MODULES(DBUS, "dbus-1", have_dbus=yes, have_dbus=no)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-# DBUS QT BINDING ### stolen from kdebluetooth-dbus which has stolen from kpowersave and knetworkmanager :P #
-CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE"
-
-
AM_CONDITIONAL(with_kdebluetooth_new, test "x$have_new_kbluetooth" = "xyes")
if test "x$have_new_kbluetooth" = "xyes"; then
PKG_CHECK_MODULES(BLUEZ, "bluez")
More information about the kmobiletools
mailing list