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

[Marco Gulino]

SVN commit 675627 by gulino:

More fixes.


 M  +12 -12    configure.in.in  


--- branches/extragear/kde3/pim/kmobiletools/configure.in.in #675626:675627
@@ -10,9 +10,9 @@
 
 AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact], [disable KMobileTools Kontact plugin (default: check)]),
 	[enable_kontact=$enableval], [enable_kontact=yes])
-if test "$enable_kontact" = "yes"; then
+if test "x$enable_kontact" = "xyes"; then
 	KDE_CHECK_HEADER(kontact/plugin.h, [have_kontact="yes"], [have_kontact="no"])
-	if test "$have_kontact" = "yes"; then
+	if test "x$have_kontact" = "xyes"; then
 		AC_DEFINE(HAVE_KONTACT, 1, [have KONTACT])
 	fi
 fi
@@ -22,9 +22,9 @@
 AC_ARG_ENABLE(libkcal, AC_HELP_STRING([--disable-libkcal], [disable KMobileTools KCalendar support (default: check)]),
 	[enable_kcal=$enableval], [enable_kcal=yes])
 
-if test "$enable_kcal" = "yes"; then
+if test "x$enable_kcal" = "xyes"; then
 	KDE_CHECK_HEADER(libkcal/event.h, [have_kcal="yes"], [have_kcal="no"])
-	if test "$have_kcal" = "yes"; then
+	if test "x$have_kcal" = "xyes"; then
 		AC_DEFINE(HAVE_KCAL, 1, [have KCAL])
 		LIB_KCAL="-lkcal"
 	else
@@ -38,14 +38,14 @@
 AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
 
 
-if test x$PKGCONFIGFOUND != xyes; then
+if test "x$PKGCONFIGFOUND" != "xyes"; then
 	AC_ERROR(pkgconfig not found.)
 fi
 	
 
 AC_ARG_WITH(gammu, AC_HELP_STRING([--without-gammu], [Build kmobiletools without gammu engine (default: check)]),
 	[with_gammu=$withval], [with_gammu=yes])
-if test "$with_gammu" = "yes" ; then # gammu forced to disabled till it'll be completed
+if test "x$with_gammu" = "xyes" ; then # gammu forced to disabled till it'll be completed
 	PKG_CHECK_MODULES(GAMMU, gammu >= 1.10.6, have_gammu=yes, have_gammu=no)
 	if test "x$have_gammu" = "xyes" ;then
 		AC_DEFINE(WITH_GAMMU, 1, [with GAMMU])
@@ -112,14 +112,14 @@
 
 AC_ARG_ENABLE(crashhandler, AC_HELP_STRING([--disable-crashhandler], [disable KMobileTools Crash Handler(default: enable)]),
     [enable_crashhandler=$enableval], [enable_crashhandler=yes])
-if test "$enable_crashhandler" = "yes"; then
+if test "x$enable_crashhandler" = "xyes"; then
   AC_DEFINE(USE_CRASHHANDLER, 1, [use CrashHandler])
   AC_SUBST(USE_CRASHHANDLER)
 fi
 
 AC_ARG_ENABLE(tests, AC_HELP_STRING([--enable-tests], [enable test applications (default: disable)]),
     [enable_tests=$enableval], [enable_tests=no])
-AM_CONDITIONAL(compile_tests, test x$enable_tests = xyes)
+AM_CONDITIONAL(compile_tests, test "x$enable_tests" = "xyes")
 
 AC_ARG_ENABLE(kdebluetooth, AC_HELP_STRING([--disable-kdebluetooth], [disable kdebluetooth integration (default: check)]),
     [enable_kdebluetooth=$enablevar], [enable_kdebluetooth=yes])
@@ -128,8 +128,8 @@
 	KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no)
 fi
 
-AM_CONDITIONAL(with_kdebluetooth, test $have_kbluetooth = yes)
-if test "$have_kbluetooth" = "yes"; then
+AM_CONDITIONAL(with_kdebluetooth, test "x$have_kbluetooth" = "xyes")
+if test "x$have_kbluetooth" = "xyes"; then
 	AC_DEFINE(KBLUETOOTH, 1, [use kdebluetooth rfcomm socket])
 	AC_SUBST(KBLUETOOTH)
 	LIB_KBLUETOOTH="-lkbluetooth"
@@ -145,8 +145,8 @@
 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE"
 
 
-AM_CONDITIONAL(with_kdebluetooth_new, test x$have_new_kbluetooth = xyes)
-if test "$have_new_kbluetooth" = "yes"; then
+AM_CONDITIONAL(with_kdebluetooth_new, test "x$have_new_kbluetooth" = "xyes")
+if test "x$have_new_kbluetooth" = "xyes"; then
        PKG_CHECK_MODULES(BLUEZ, "bluez")
        AC_DEFINE(KBLUETOOTH_NEW, 1, [use new kdebluetooth])
        AC_SUBST(KBLUETOOTH_NEW)