Author: jim
Date: Fri Jan 18 19:00:44 2019
New Revision: 1851640
URL: http://svn.apache.org/viewvc?rev=1851640&view=rev
Log:
Merge r1851639 from trunk:
OK, let's not confuse things... we can make sure builders know that they need
to explcitly add beanshell even if including catB in the upgrade notes.
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/configure.ac
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 18 19:00:44 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,1851575,1851634,1851637
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639
Modified: openoffice/branches/AOO42X/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/configure.ac?rev=1851640&r1=1851639&r2=1851640&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/configure.ac (original)
+++ openoffice/branches/AOO42X/main/configure.ac Fri Jan 18 19:00:44 2019
@@ -489,7 +489,7 @@ AC_ARG_WITH(system-beanshell,
[ --with-system-beanshell Use beanshell already on system (default)
],,)
AC_ARG_ENABLE(beanshell,
-[ --disable-beanshell Disable the use of beanshell.
+[ --enable-beanshell Enable the use of beanshell.
],,)
AC_ARG_WITH(beanshell-jar,
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
@@ -1450,9 +1450,8 @@ 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])
+ AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino,
graphite, coinmp to be built])
else
# Disable libraries.
enable_nss_module="no"
@@ -1463,7 +1462,6 @@ 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
