|  |  | @@ -2881,6 +2881,18 @@ map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | if enabled nonfree; then | 
		
	
		
			
			|  |  |  | license="nonfree and unredistributable" | 
		
	
		
			
			|  |  |  | elif enabled gplv3; then | 
		
	
		
			
			|  |  |  | license="GPL version 3 or later" | 
		
	
		
			
			|  |  |  | elif enabled lgplv3; then | 
		
	
		
			
			|  |  |  | license="LGPL version 3 or later" | 
		
	
		
			
			|  |  |  | elif enabled gpl; then | 
		
	
		
			
			|  |  |  | license="GPL version 2 or later" | 
		
	
		
			
			|  |  |  | else | 
		
	
		
			
			|  |  |  | license="LGPL version 2.1 or later" | 
		
	
		
			
			|  |  |  | fi | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | enabled_all gnutls openssl && | 
		
	
		
			
			|  |  |  | die "GnuTLS and OpenSSL must not be enabled at the same time." | 
		
	
		
			
			|  |  |  | 
 | 
		
	
	
		
			
				|  |  | @@ -5170,17 +5182,6 @@ if test -n "$ignore_tests"; then | 
		
	
		
			
			|  |  |  | echo | 
		
	
		
			
			|  |  |  | fi | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | license="LGPL version 2.1 or later" | 
		
	
		
			
			|  |  |  | if enabled nonfree; then | 
		
	
		
			
			|  |  |  | license="nonfree and unredistributable" | 
		
	
		
			
			|  |  |  | elif enabled gplv3; then | 
		
	
		
			
			|  |  |  | license="GPL version 3 or later" | 
		
	
		
			
			|  |  |  | elif enabled lgplv3; then | 
		
	
		
			
			|  |  |  | license="LGPL version 3 or later" | 
		
	
		
			
			|  |  |  | elif enabled gpl; then | 
		
	
		
			
			|  |  |  | license="GPL version 2 or later" | 
		
	
		
			
			|  |  |  | fi | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | echo "License: $license" | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | fi # test "$quiet" != "yes" | 
		
	
	
		
			
				|  |  | 
 |