summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 18:36:14 +0200
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 18:36:14 +0200
commite4804c5d3d2e80cc7f57936591374d29478dbb2a (patch)
tree76a85948ed5db925fda81028169e8dcde23b52b4 /configure
parentfc4c4071d6e5704e84a5cca4ae22548bedb7b19d (diff)
parentb2e91ecd641b9c891ea823cfc647f729af6228e8 (diff)
Merge branch '4.5' into 4.6
Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 10 insertions, 5 deletions
diff --git a/configure b/configure
index 3f3e55a3c4..15adf8bf64 100755
--- a/configure
+++ b/configure
@@ -3842,16 +3842,21 @@ if [ "$Edition" = "NokiaInternalBuild" ]; then
elif [ "$Edition" = "OpenSource" ]; then
while true; do
echo "You are licensed to use this software under the terms of"
- echo "the GNU General Public License (GPL) versions 3."
- echo "You are also licensed to use this software under the terms of"
echo "the Lesser GNU General Public License (LGPL) versions 2.1."
+ if [ -e "$relpath/LICENSE.GPL3" ]; then
+ echo "You are also licensed to use this software under the terms of"
+ echo "the GNU General Public License (GPL) versions 3."
+ affix="either"
+ else
+ affix="the"
+ fi
echo
- affix="either"
if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
- echo "You have already accepted the terms of the $LicenseType license."
+ echo "You have already accepted the terms of the $LicenseType license."
acceptance=yes
else
- echo "Type '3' to view the GNU General Public License version 3."
+ test -e "$relpath/LICENSE.GPL3" && \
+ echo "Type '3' to view the GNU General Public License version 3."
echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."