summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-03 04:55:23 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-22 05:26:40 (GMT)
commit0bcb2788e1eb225e0e3babb4ca113bcb5769dfc2 (patch)
treeb5c2f8e88576a3ff407a4ccf46ab725169b172e6 /configure
parent13a519ce2d85ee006f2a30a50029195465249b01 (diff)
downloadQt-0bcb2788e1eb225e0e3babb4ca113bcb5769dfc2.zip
Qt-0bcb2788e1eb225e0e3babb4ca113bcb5769dfc2.tar.gz
Qt-0bcb2788e1eb225e0e3babb4ca113bcb5769dfc2.tar.bz2
Add config.test for CoreWlan.
Untested, I don't have a mac.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 15 insertions, 0 deletions
diff --git a/configure b/configure
index dcd7d2d..b686081 100755
--- a/configure
+++ b/configure
@@ -766,6 +766,7 @@ CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_ALSA=auto
CFG_NETWORKMANAGER=auto
+CFG_COREWLAN=auto
# initalize variables used for installation
QT_INSTALL_PREFIX=
@@ -5365,6 +5366,14 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
# Always enable Phonon (unless it was explicitly disabled)
CFG_PHONON=yes
fi
+
+ if [ "$CFG_COREWLAN" = "auto" ]; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/corewlan "CoreWlan" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ CFG_COREWLAN=yes
+ else
+ CFG_COREWLAN=no
+ fi
+ fi
fi
# QWS
@@ -6310,6 +6319,10 @@ if [ "$CFG_NETWORKMANAGER" = "yes" ]; then
QT_CONFIG="$QT_CONFIG networkmanager"
fi
+if [ "$CFG_COREWLAN" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG corewlan"
+fi
+
#
# Some Qt modules are too advanced in C++ for some old compilers
# Detect here the platforms where they are known to work.
@@ -7011,6 +7024,7 @@ fi
[ "$CFG_XINPUT" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT"
[ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA"
[ "$CFG_NETWORKMANAGER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NETWORKMANAGER"
+[ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
# sort QCONFIG_FLAGS for neatness if we can
[ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
@@ -7537,6 +7551,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG"
fi
echo "alsa support ........... $CFG_ALSA"
echo "NetworkManager support . $CFG_NETWORKMANAGER"
+echo "CoreWlan support ....... $CFG_COREWLAN"
echo
sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`