[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/kdebluetooth
From:       Michael Buesch <mbuesch () freenet ! de>
Date:       2005-01-22 20:33:12
Message-ID: 20050122203312.4067E1CF84 () office ! kde ! org
[Download RAW message or body]

CVS commit by mbuesch: 

avoid shell syntax errors, if openobex is not installed.


  M +11 -8     configure.in.in   1.20


--- kdeextragear-3/kdebluetooth/configure.in.in  #1.19:1.20
@@ -137,4 +137,5 @@
         AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.)
         DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+        OPENOBEX_CONFIG="false"
 fi
 
@@ -170,14 +171,16 @@
         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 
-if test $obex_req_major_version -lt $obex_config_major_version ; then
-        obex_config_version_ok="yes"
-fi
-if test $obex_req_major_version -eq $obex_config_major_version ; then
-        if test $obex_req_minor_version -lt $obex_config_minor_version ; then
+if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then
+        if test $obex_req_major_version -lt $obex_config_major_version ; then
                 obex_config_version_ok="yes"
-        fi
-        if test $obex_req_minor_version -eq $obex_config_minor_version ; then
-                if test $obex_req_micro_version -le $obex_config_micro_version ; then
+        fi
+        if test $obex_req_major_version -eq $obex_config_major_version ; then
+                if test $obex_req_minor_version -lt $obex_config_minor_version ; then
                         obex_config_version_ok="yes"
+                fi
+                if test $obex_req_minor_version -eq $obex_config_minor_version ; then
+                        if test $obex_req_micro_version -le $obex_config_micro_version ; then
+                                obex_config_version_ok="yes"
+                        fi
                 fi
         fi


[prev in list] [next in list] [prev in thread] [next in thread]