[kmobiletools] branches/kmobiletools/kmobiletools-0.5

[Marco Gulino]

SVN commit 670688 by gulino:

Configure check for kdebluetooth-dbus (still to implement)


 M  +7 -0      configure.in.bot  
 M  +19 -0     configure.in.in  


--- branches/kmobiletools/kmobiletools-0.5/configure.in.bot #670687:670688
@@ -14,7 +14,14 @@
     echo -e "$DISABLED"
 else echo -e "$ENABLED";
 fi
+echo -en "KDEBluetooth-DBus Integration\t\t"
+if test x$have_new_kbluetooth != xyes; then
+    echo -e "$DISABLED"
+else echo -e "$ENABLED";
+fi
 
+
+
 # gammu
 echo -en "Gammu Engine\t\t\t\t"
 if test x$have_gammu != xyes; then
--- branches/kmobiletools/kmobiletools-0.5/configure.in.in #670687:670688
@@ -126,6 +126,25 @@
 fi
 AC_SUBST(LIB_KBLUETOOTH)
 
+#KDEBluetooth-DBUS module
+PKG_CHECK_MODULES(DBUS, "dbus-1")
+
+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"
+
+
+KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no)
+AM_CONDITIONAL(with_kdebluetooth_new, test x$have_new_kbluetooth = xyes)
+if test "$have_new_kbluetooth" = "yes"; then
+       AC_DEFINE(KBLUETOOTH_NEW, 1, [use new kdebluetooth])
+       AC_SUBST(KBLUETOOTH_NEW)
+       LIB_KBLUETOOTH="-lkbluetooth"
+fi
+AC_SUBST(LIB_KBLUETOOTH)
+
+
 SVNREV=`svn st -v $srcdir/kmobiletools | grep -v '?' | awk '{ print $1 }' | sort -rn | head -n 1`
 AC_DEFINE_UNQUOTED( SVNREVISION, "$SVNREV", [Subversion revision] )