summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-06-09 11:45:53 +0100
committerCaolán McNamara <cmc@openoffice.org>2010-06-09 11:45:53 +0100
commitd9a0f01dddeedaf968c4b13636cf412808ce5ce8 (patch)
tree55ff7c3bb4937e7ec640d91f491697c5d9699338 /configure.in
parent5d2ff9dcf5ed11b8d0379fca73a8596890b2ef2b (diff)
parent09b8d8f9054c8b7413b218972ba0b07fa70c55ab (diff)
cmcfixes75: merge with DEV300 m81
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 765b78dd6cf7..10f2fc4d73e9 100644
--- a/configure.in
+++ b/configure.in
@@ -6045,7 +6045,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
[AC_MSG_ERROR(commons-codec.jar replacement not found.)]
)
]
@@ -6415,11 +6415,11 @@ fi
dnl ===================================================================
dnl Test whether to include fonts
dnl ===================================================================
-AC_MSG_CHECKING([whether to include Bitstream Vera fonts])
+AC_MSG_CHECKING([whether to include third-party fonts])
if test "$with_fonts" != "no" ; then
AC_MSG_RESULT([yes])
WITH_FONTS=YES
- BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS"
+ BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
else
AC_MSG_RESULT([no])
WITH_FONTS=NO