Kaydet (Commit) 34f86524 authored tarafından Herbert Dürr's avatar Herbert Dürr

#i119168# updated configure help for category-b/aggregation instructions and…

#i119168# updated configure help for category-b/aggregation instructions and update license/notice boilerplate text
üst 96ec6f6b
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/
...@@ -187,7 +186,7 @@ ...@@ -187,7 +186,7 @@
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright [yyyy] [name of copyright owner] Copyright 2012 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
......
...@@ -5,7 +5,10 @@ dictionary extensions that are merely aggregated for the convenience ...@@ -5,7 +5,10 @@ dictionary extensions that are merely aggregated for the convenience
of end users. of end users.
Basis for this aggregation is Apache JIRA issue LEGAL-117 Basis for this aggregation is Apache JIRA issue LEGAL-117
- https://issues.apache.org/jira/browse/LEGAL-117 - https://issues.apache.org/jira/browse/LEGAL-117
As these dictionary extensions are only aggregated These parts are only included in binary form.
In the case of Apache OpenOffice these parts only get aggregated
when the configure option --with-bundled-extension-blobs or
--enable-bundled-dictionaries have been requested.
When you use these options make sure to add the license here:
The licenses of the aggregated dictionary extensions are typically
GNU General Public License and/or GNU Lesser General Public License.
___
In the case of Apache OpenOffice some parts only get aggregated
when the configure option --with-bundled-extension-blobs or
--enable-bundled-dictionaries have been requested.
When you use these options make sure to comply with the
distribution requirements of these packages by extending
this file with the notices recommended by them:
___
Apache OpenOffice has some optional parts that only get included
when the configure option --enable-category-b has been requested.
When you used this option make sure to comply with the
distribution requirements of these parts by extending
this file with the notices recommended by them:
...@@ -331,6 +331,8 @@ AC_ARG_WITH(bundled-extension-blobs, ...@@ -331,6 +331,8 @@ AC_ARG_WITH(bundled-extension-blobs,
that are to be bundled as-is for installation as extensions that are to be bundled as-is for installation as extensions
at the first program start. Make sure to only bundle extensions at the first program start. Make sure to only bundle extensions
which can be installed without requiring a license dialog which can be installed without requiring a license dialog
and comply with their distribution requirements by updating the
files LICENSE_aggregated and NOTICE_aggregated accordingly
],,) ],,)
#AC_ARG_WITH(bundled-prereg-extensions, #AC_ARG_WITH(bundled-prereg-extensions,
#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that #[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
...@@ -339,7 +341,9 @@ AC_ARG_WITH(bundled-extension-blobs, ...@@ -339,7 +341,9 @@ AC_ARG_WITH(bundled-extension-blobs,
#],,) #],,)
AC_ARG_ENABLE(bundled-dictionaries, AC_ARG_ENABLE(bundled-dictionaries,
[ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus) [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus)
according to main/extensions.lst and bundle them. according to main/extensions.lst and bundle them. Make sure to
comply with their distribution requirements and update the
files LICENSE_aggregated and NOTICE_aggregated accordingly
],,enable_bundled_dictionaries=no) ],,enable_bundled_dictionaries=no)
# Remove the following switches when not in release mode. # Remove the following switches when not in release mode.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment