Changes: add -dbus and -no-dbus switches to configure script

RevBy: Sergiy

1 files changed, 26 insertions, 7 deletions

diff --git a/configure b/configure
index 5d7f6f60..7d0912e9 100755
--- a/configure
+++ b/configure
@@ -66,6 +66,7 @@ CFG_BUILD_EXAMPLES=no
 M_DEFAULT_BUILD_PARTS="libs demos"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
+CFG_DBUS=auto
 CFG_ICU=auto
 CFG_GCONF=auto
 
@@ -124,7 +125,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -h|-help|-v|-verbose|-debug|-release|-testable|-coverage|-timestamps|-dev|-minimal|-icu|-gconf)
+        -h|-help|-v|-verbose|-debug|-release|-testable|-coverage|-timestamps|-dev|-minimal|-dbus|-icu|-gconf)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -243,6 +244,13 @@ while [ "$#" -gt 0 ]; do
     maemo5)
         IS_MAEMO5="yes"
         ;;
+    dbus)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_DBUS="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
     icu)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_ICU="$VAL"
@@ -406,10 +414,18 @@ if [ $? -eq 0 ]; then
 	HAVE_GSTREAMER=yes
     fi
 
-    pkg-config --exists QtDBus
-    if [ $? -eq 0 ]; then
-	HAVE_DBUS=yes
-    fi    
+    # Test for DBus
+    if [ "$CFG_DBUS" != "no" ]; then
+        pkg-config --exists QtDBus
+        if [ $? -eq 0 ]; then
+	    HAVE_DBUS=yes
+        fi
+        if [ "$CFG_DBUS" = "yes" -a "$HAVE_DBUS" = "no" ]; then
+            echo "You specified  -dbus  but dbus was not found."
+            echo "Please install the DBus and QtDBus packages."
+            exit 1
+        fi
+    fi
 
     pkg-config --exists contentaction-0.1
     if [ $? -eq 0 ]; then
@@ -485,12 +501,15 @@ Additional options:
 
     -maemo5 ............ Build libmeegotouch for the N900 device with maemo5.
 
-    -no-icu ............ Do not compile with ICU support.
- +  -icu ............... Compile with ICU support.
+    -no-dbus ........... Do not compile with DBus support.
+ +  -dbus .............. Compile with DBus support.
 
     -no-gconf .......... Do not compile with gconf support.
  +  -gconf ............. Compile with gconf support.
 
+    -no-icu ............ Do not compile with ICU support.
+ +  -icu ............... Compile with ICU support.
+
     -no-plainqt......... Do not build the Plain Qt style plugin.
  +  -plainqt ........... Build the Plain Qt style plugin.