diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-15 01:25:05 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-15 01:29:24 (GMT) |
| commit | ad19b397c52186acd76f0bbf43fe9b90ca5a5442 (patch) | |
| tree | e75f635be9bd257afeb20e5b29d6ca8075151f4f /configure | |
| parent | e7aee79a5606dd7d58d155fb05568f6f3d469a2c (diff) | |
| download | Qt-ad19b397c52186acd76f0bbf43fe9b90ca5a5442.zip Qt-ad19b397c52186acd76f0bbf43fe9b90ca5a5442.tar.gz Qt-ad19b397c52186acd76f0bbf43fe9b90ca5a5442.tar.bz2 | |
Remove configure test for NetworkManager.
The NetworkManager plugin for Brearer Management no longer has a compile
time dependency on NetworkManager.
Task-number: QTBUG-9005
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -785,7 +785,6 @@ CFG_SILENT=no CFG_GRAPHICS_SYSTEM=default CFG_ALSA=auto CFG_PULSEAUDIO=auto -CFG_NETWORKMANAGER=auto CFG_COREWLAN=auto # initalize variables used for installation @@ -5954,14 +5953,6 @@ if [ "$CFG_PULSEAUDIO" = "auto" ]; then fi fi -if [ "$CFG_NETWORKMANAGER" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/networkmanager "NetworkManager" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_NETWORKMANAGER=yes - else - CFG_NETWORKMANAGER=no - fi -fi - if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS @@ -6448,10 +6439,6 @@ if [ "$CFG_PULSEAUDIO" = "yes" ]; then QT_CONFIG="$QT_CONFIG pulseaudio" fi -if [ "$CFG_NETWORKMANAGER" = "yes" ]; then - QT_CONFIG="$QT_CONFIG networkmanager" -fi - if [ "$CFG_COREWLAN" = "yes" ]; then QT_CONFIG="$QT_CONFIG corewlan" fi @@ -7179,7 +7166,6 @@ fi [ "$CFG_XINPUT" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT" [ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" [ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO" -[ "$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 @@ -7683,7 +7669,6 @@ fi echo "OpenSSL support ........ $CFG_OPENSSL $OPENSSL_LINKAGE" echo "Alsa support ........... $CFG_ALSA" echo "Pulse Audio support .... $CFG_PULSEAUDIO" -echo "NetworkManager support . $CFG_NETWORKMANAGER" if [ "$PLATFORM_MAC" = "yes" ]; then echo "CoreWlan support ....... $CFG_COREWLAN" fi |