From c470f8d1523ec974a7f0e1cb61ef13f0e953c500 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 5 Feb 2010 13:59:49 +1000
Subject: Fix Network Manager and CoreWlan config tests.

---
 config.tests/unix/networkmanager/main.cpp           | 5 +++--
 config.tests/unix/networkmanager/networkmanager.pro | 4 ----
 configure                                           | 4 +++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp
index f8b3d3c..7b91ae0 100644
--- a/config.tests/unix/networkmanager/main.cpp
+++ b/config.tests/unix/networkmanager/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -40,8 +40,9 @@
 ****************************************************************************/
 
 #if defined(QT_NO_DBUS)
-sjkp //error is no QtDBus
+#error Qt is not configured with DBus support.
 #endif
+
 #include <NetworkManager/NetworkManager.h>
 
 int main(int argc, char** argv)
diff --git a/config.tests/unix/networkmanager/networkmanager.pro b/config.tests/unix/networkmanager/networkmanager.pro
index 686286d..c41204f 100644
--- a/config.tests/unix/networkmanager/networkmanager.pro
+++ b/config.tests/unix/networkmanager/networkmanager.pro
@@ -1,7 +1,3 @@
 SOURCES = main.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-
-!contains(QT_CONFIG,dbus): {
-    DEFINES += QT_NO_DBUS
-}
\ No newline at end of file
diff --git a/configure b/configure
index 13f58c8..a55e9ee 100755
--- a/configure
+++ b/configure
@@ -7587,7 +7587,9 @@ fi
 echo "OpenSSL support ........ $CFG_OPENSSL $OPENSSL_LINKAGE"
 echo "Alsa support ........... $CFG_ALSA"
 echo "NetworkManager support . $CFG_NETWORKMANAGER"
-echo "CoreWlan support ....... $CFG_COREWLAN"
+if [ "$PLATFORM_MAC" = "yes" ]; then
+    echo "CoreWlan support ....... $CFG_COREWLAN"
+fi
 echo
 
 [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC"
-- 
cgit v0.12