Author: jim
Date: Fri Jan 18 19:00:20 2019
New Revision: 1851639
URL: http://svn.apache.org/viewvc?rev=1851639&view=rev
Log:
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.
Modified:
openoffice/trunk/main/configure.ac
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1851639&r1=1851638&r2=1851639&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Jan 18 19:00:20 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
