[kmobiletools] branches/extragear/kde3/pim/kmobiletools

[Marco Gulino]

SVN commit 680639 by gulino:

BUG:146987
Disabling obexftp kioslave if kdebluetooth 1.0-beta3 or upper is found on configure.


 M  +6 -3      configure.in.bot  
 M  +39 -38    configure.in.in  


--- branches/extragear/kde3/pim/kmobiletools/configure.in.bot #680638:680639
@@ -10,10 +10,10 @@
 
 # kdebluetooth
 KDEBLUETOOTH_VER=$DISABLED
-if test x$have_kbluetooth = xyes; then
+if test "x$have_kbluetooth" = "xyes"; then
 	KDEBLUETOOTH_VER="1.0-beta2"
 fi
-if test x$have_new_kbluetooth = xyes; then
+if test "x$have_new_kbluetooth" = "xyes"; then
 	KDEBLUETOOTH_VER="with dbus integration"
 fi
 echo -e "KDEBluetooth Integration\t\t$KDEBLUETOOTH_VER"
@@ -44,7 +44,10 @@
 fi
 
 echo -e "\n*************************************************\n"
-if test x$have_gammu != xyes; then
+if test "x$have_gammu" != "xyes"; then
     echo -e "Please note that you need EXACTLY gammu (or libgammu) 1.10.6.\nIf your distribution has another version,\nread http://www.kmobiletools.org/gammu for more details."
 fi
 
+if test "x$have_new_kbluetooth" = "xyes" && test "x$have_obexftp" != "xyes"; then
+    echo -e "ObexFTP Kioslave support was disabled since it seems you have installed KDEBluetooth 1.0-beta3 or upper version, which does provide exactly the same obexftp kioslave included in kmobiletools."
+fi
--- branches/extragear/kde3/pim/kmobiletools/configure.in.in #680638:680639
@@ -72,44 +72,6 @@
 #AC_SUBST(LIB_GAMMU)
 #AM_CONDITIONAL(with_gammu, test $have_gammu = yes)
 
-AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]),
-    [enable_kioslaves=$enableval], [enable_kioslaves=yes])
-
-AC_ARG_ENABLE(p2kmoto, AC_HELP_STRING([--disable-p2kmoto], [disable p2kmoto kioslave (default: check)]),
-    [enable_p2kmoto=$enableval], [enable_p2kmoto=yes])
-if test "x$enable_p2kmoto" = "xyes" && test "x$enable_kioslaves" = "xyes"; then
-	KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no) 
-fi
-AM_CONDITIONAL(with_p2kmoto, test "x$have_p2k" = "xyes")
-
-AC_ARG_ENABLE(obexftp, AC_HELP_STRING([--disable-obexftp], [disable obex kioslave (default: check)]),
-    [enable_obexftp=$enableval], [enable_obexftp=yes])
-if test "x$enable_obexftp" = "xyes" && test "x$enable_kioslaves" = "xyes"; then
-	KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no) 
-fi
-AM_CONDITIONAL(compile_obex, test "x$have_obexftp" = "xyes")
-
-if test "x$have_p2k" = "xyes"; then
-	AC_DEFINE(HAVE_P2KLIB, 1, [p2k filesystem support])
-	AC_SUBST(HAVE_P2KLIB)
-fi
-
-if test "x$have_obexftp" = "xyes"; then
-	AC_DEFINE(HAVE_OBEXFTP, 1, [ObexFTP filesystem support])
-	AC_SUBST(HAVE_OBEXFTP)
-fi
-
-if test "x$have_p2k" = "xyes" || test "x$have_obexftp" = "xyes"; then
-    ENABLE_KIOSLAVES="yes";
-    else ENABLE_KIOSLAVES="no";
-fi
-
-AM_CONDITIONAL(compile_kioslaves, test "x$ENABLE_KIOSLAVES" = "xyes" )
-if test "x$ENABLE_KIOSLAVES" = "xyes"; then
-    AC_DEFINE(ENABLE_FS, 1, [filesystem support])
-    AC_SUBST(ENABLE_FS)
-fi
-
 AC_ARG_ENABLE(crashhandler, AC_HELP_STRING([--disable-crashhandler], [disable KMobileTools Crash Handler(default: enable)]),
     [enable_crashhandler=$enableval], [enable_crashhandler=yes])
 if test "x$enable_crashhandler" = "xyes"; then
@@ -156,6 +118,45 @@
 AC_SUBST(LIB_KBLUETOOTH)
 
 
+AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]),
+    [enable_kioslaves=$enableval], [enable_kioslaves=yes])
+
+AC_ARG_ENABLE(p2kmoto, AC_HELP_STRING([--disable-p2kmoto], [disable p2kmoto kioslave (default: check)]),
+    [enable_p2kmoto=$enableval], [enable_p2kmoto=yes])
+#if test "x$enable_p2kmoto" = "xyes" && test "x$enable_kioslaves" = "xyes"; then
+#	KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no) 
+#fi
+AM_CONDITIONAL(with_p2kmoto, test "x$enable_p2kmoto" = "xyes")
+
+AC_ARG_ENABLE(obexftp, AC_HELP_STRING([--disable-obexftp], [disable obex kioslave (default: check)]),
+    [enable_obexftp=$enableval], [enable_obexftp=yes])
+if test "x$enable_obexftp" = "xyes" && test "x$enable_kioslaves" = "xyes" && test "x$have_new_kbluetooth" != "xyes"; then
+	KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no) 
+fi
+AM_CONDITIONAL(compile_obex, test "x$have_obexftp" = "xyes")
+
+if test "x$have_p2k" = "xyes"; then
+	AC_DEFINE(HAVE_P2KLIB, 1, [p2k filesystem support])
+	AC_SUBST(HAVE_P2KLIB)
+fi
+
+if test "x$have_obexftp" = "xyes"; then
+	AC_DEFINE(HAVE_OBEXFTP, 1, [ObexFTP filesystem support])
+	AC_SUBST(HAVE_OBEXFTP)
+fi
+
+if test "x$have_p2k" = "xyes" || test "x$have_obexftp" = "xyes"; then
+    ENABLE_KIOSLAVES="yes";
+    else ENABLE_KIOSLAVES="no";
+fi
+
+AM_CONDITIONAL(compile_kioslaves, test "x$ENABLE_KIOSLAVES" = "xyes" )
+if test "x$ENABLE_KIOSLAVES" = "xyes"; then
+    AC_DEFINE(ENABLE_FS, 1, [filesystem support])
+    AC_SUBST(ENABLE_FS)
+fi
+
+
 SVNREV=`svn st -v $srcdir/kmobiletools | grep -v '?' | awk '{ print $1 }' | sort -rn | head -n 1`
 AC_DEFINE_UNQUOTED( SVNREVISION, "$SVNREV", [Subversion revision] )