2 files changed, 12 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 33531252bf..4ed88939a1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -995,6 +995,8 @@ void Configure::parseCmdLine()
             sybaseLibs = configCmdLine.at(i);
         } else if (configCmdLine.at(i).startsWith("DBUS_PATH=")) {
             dbusPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1));
+        } else if (configCmdLine.at(i).startsWith("DBUS_HOST_PATH=")) {
+            dbusHostPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1));
         } else if (configCmdLine.at(i).startsWith("MYSQL_PATH=")) {
             mysqlPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1));
         } else if (configCmdLine.at(i).startsWith("ZLIB_LIBS=")) {
@@ -2928,9 +2930,15 @@ void Configure::generateOutputVars()
             qmakeVars += QString("OPENSSL_LIBS += -L%1/lib").arg(opensslPath);
         }
     }
-    if (dictionary[ "DBUS" ] != "no" && !dbusPath.isEmpty()) {
-        qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
-        qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath);
+    if (dictionary[ "DBUS" ] != "no") {
+       if (!dbusPath.isEmpty()) {
+           qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
+           qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath);
+           if (dbusHostPath.isEmpty())
+               qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
+       }
+       if (!dbusHostPath.isEmpty())
+           qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusHostPath);
     }
     if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) {
         qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath);
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 9c14d5e63b..71ef210e89 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -133,6 +133,7 @@ private:
     QString opensslLibsRelease;
     QString opensslPath;
     QString dbusPath;
+    QString dbusHostPath;
     QString mysqlPath;
     QString psqlLibs;
     QString zlibLibs;