summaryrefslogtreecommitdiff
path: root/pygnulib/GLInfo.py
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2022-08-03 16:49:15 +0200
committerBruno Haible <bruno@clisp.org>2022-08-03 16:50:03 +0200
commite2d15e5c893e42b32a840a6641d5fa8cef7b4f7c (patch)
tree1c11d2131d4dec895679058fd729ec8d6f8856e3 /pygnulib/GLInfo.py
parent65301e0739f8c86cf96403d6426551df3c3f3ac3 (diff)
downloadgnulib-e2d15e5c893e42b32a840a6641d5fa8cef7b4f7c.tar.gz
gnulib-tool.py: Follow gnulib-tool changes, part 23.
Follow gnulib-tool changes 2016-11-11 Bruno Haible <bruno@clisp.org> gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license. 2016-12-02 Nikos Mavrogiannopoulos <nmav@gnutls.org> gnulib-tool (func_import): Adhere to the license guideline ... 2016-12-02 Daiki Ueno <ueno@gnu.org> gnulib-tool (func_import): Relax the regex ... * gnulib-tool.py: For --lgpl, accept value 3orGPLv2. * pygnulib/GLInfo.py (GLInfo.usage): Update. * pygnulib/GLConfig.py (GLConfig.setLGPL): Update argument check. * pygnulib/GLImport.py (GLImport.__init__, GLImport.gnulib_cache): Update gl_LGPL handling. (GLImport.prepare): Update license compatibility checks and license header rewriting. * pygnulib/GLTestDir.py (GLTestDir.execute): Update license compatibility checks. Handle also the licenses GPLv3+, GPL, LGPLv3+.
Diffstat (limited to 'pygnulib/GLInfo.py')
-rw-r--r--pygnulib/GLInfo.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py
index 79c1ba0cf1..720e357c90 100644
--- a/pygnulib/GLInfo.py
+++ b/pygnulib/GLInfo.py
@@ -251,7 +251,8 @@ Options for --import, --add/remove-import:
placed (default \"tests\").
--aux-dir=DIRECTORY Directory relative to --dir where auxiliary build
tools are placed (default comes from configure.ac).
- --lgpl[=2|=3] Abort if modules aren't available under the LGPL.
+ --lgpl[=2|=3orGPLv2|=3]
+ Abort if modules aren't available under the LGPL.
Also modify license template from GPL to LGPL.
The version number of the LGPL can be specified;
the default is currently LGPLv3.