summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 05:58:11 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 09:22:25 (GMT)
commitb2e91ecd641b9c891ea823cfc647f729af6228e8 (patch)
tree2c9df8e3bb8a3df4054756e545300bb63f063720 /configure
parent651f63172e4f68f8e084c16415499fdbda08bf39 (diff)
downloadQt-b2e91ecd641b9c891ea823cfc647f729af6228e8.zip
Qt-b2e91ecd641b9c891ea823cfc647f729af6228e8.tar.gz
Qt-b2e91ecd641b9c891ea823cfc647f729af6228e8.tar.bz2
Make the existence of the LICENSE.GPL3 file optional
The repository no longer carries this license. The final releases will still have it. In any case, the LGPLv2.1 is compatible with the GPLv3. Required-By: Nokia Legal Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 10 insertions, 5 deletions
diff --git a/configure b/configure
index 7af8487..6832ad3 100755
--- a/configure
+++ b/configure
@@ -3710,16 +3710,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."