Author: jim
Date: Thu Jan 17 20:08:02 2019
New Revision: 1851576
URL: http://svn.apache.org/viewvc?rev=1851576&view=rev
Log:
Merge r1851575 from trunk:
beanshell is catB
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/configure.ac
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 17 20:08:02 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575
Modified: openoffice/branches/AOO42X/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/configure.ac?rev=1851576&r1=1851575&r2=1851576&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/configure.ac (original)
+++ openoffice/branches/AOO42X/main/configure.ac Thu Jan 17 20:08:02 2019
@@ -1442,6 +1442,7 @@ AC_MSG_CHECKING([whether to enable categ
# graphite (silgraphite)
if test "$enable_category_b" = "yes"; then
ENABLE_CATEGORY_B=YES
+ enable_nss_module="yes"
enable_hunspell="yes"
enable_hyphen="yes"
enable_saxon="yes"
@@ -1449,6 +1450,7 @@ if test "$enable_category_b" = "yes"; th
enable_graphite="yes"
enable_coinmp="yes"
enable_category_b_fonts="yes"
+ enable_beanshell="yes"
AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino,
beanshell, graphite, coinmp to be built])
else
@@ -1461,6 +1463,7 @@ else
enable_graphite="no"
enable_coinmp="no"
enable_category_b_fonts="no"
+ enable_beanshell="no"
AC_MSG_RESULT([no: disabled modules nss, hunspell, hyphen, saxon, rhino,
graphite, coinmp])
fi
