diff options
| author | Herbert Duerr [hdu] <duerr@sun.com> | 2010-04-23 09:09:53 +0200 |
|---|---|---|
| committer | Herbert Duerr [hdu] <duerr@sun.com> | 2010-04-23 09:09:53 +0200 |
| commit | d2dd8e23efe152466cee2ae1deb0d213ba2bf018 (patch) | |
| tree | c6057bbd44d6a2e1bd222c72e20c96bd752f4818 | |
| parent | a0de0def4a49a63c6675a622123b793da8b4c78d (diff) | |
#i111077# prepare rename folder of third-party fonts
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | solenv/config/sdev300.ini | 2 | ||||
| -rw-r--r-- | splitbuild/extern.lst | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/configure b/configure index 758b170295e1..b1d719629c57 100755 --- a/configure +++ b/configure @@ -28060,13 +28060,13 @@ echo "${ECHO_T}no" >&6 SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi -echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 -echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether to include third-party fonts" >&5 +echo $ECHO_N "checking whether to include third-party fonts... $ECHO_C" >&6 if test "$with_fonts" != "no" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 WITH_FONTS=YES - BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS" + BUILD_TYPE="$BUILD_TYPE MORE_FONTS" else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 diff --git a/configure.in b/configure.in index 91ff5806fbe5..480f0e4e1b61 100644 --- a/configure.in +++ b/configure.in @@ -6435,11 +6435,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 diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 878ae45c99f0..104a65b89e0f 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,7 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT + BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst index 334ad19a5b10..000db8095f5c 100644 --- a/splitbuild/extern.lst +++ b/splitbuild/extern.lst @@ -1 +1 @@ -afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib +afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib |