> Sounds good to me; go for it ! :-)
OK to push this patch? USer visible changes are:
Rename --with-fonts to --enable-fonts and --enable-extra-font to
--enable-extra-fonts to make them consistent. Improve help texts.
Make it so that --enable-extra-fonts implies --enable-fonts.
Both options are turned off by default, distros that want fonts
bundled need to set that in their distro conf.
Optinions? opens___.ttf will still be bundled in any case
>From f58b6d6d322d3dbb035117644fcdf7ae3093f97a Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <sebast...@sspaeth.de>
Date: Wed, 8 Dec 2010 12:21:09 +0100
Subject: [PATCH] Configure --enable-fonts --enable-extra-fonts both disabled by def.
Rename --with-fonts to --enable-fonts and --enable-extra-font to
--enable-extra fonts to make them consistent.
Both options are turned off by default, distros that want fonts
bundled need to set that in their distro conf.
Make it so that --enable-extra-fonts implies --enable-fonts.
Move the options and checks to be next to each other in configure.in
Signed-off-by: Sebastian Spaeth <sebast...@sspaeth.de>
---
configure.in | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/configure.in b/configure.in
index 0e60fdd..bc9df97 100644
--- a/configure.in
+++ b/configure.in
@@ -482,10 +482,18 @@ AC_ARG_ENABLE(extra-sample,
[Add extra sample content.]),
,)
-AC_ARG_ENABLE(extra-font,
- AS_HELP_STRING([--enable-extra-font],
- [Add extra font content.]),
-,)
+AC_ARG_ENABLE(fonts,
+ AS_HELP_STRING([--enable-fonts],
+ [Include third-party fonts (DejaVu, Liberation, Gentium,
+ Libertine G and Linux Biolinum G) bundled with the product.
+ Enable this if you compile for a platform that does not contain
+ a sensible set of system fonts already.]),
+)
+
+AC_ARG_ENABLE(extra-fonts,
+ AS_HELP_STRING([--enable-extra-fonts],
+ [Bundle even more fonts with the product. (implies --enable-fonts)]),
+)
dnl ---------- Deprecated since 2010-11-05 ----------
@@ -604,13 +612,6 @@ AC_ARG_WITH(extension-integration,
[It will integrate the builded extensions to the installer of the product.]),
,)
-AC_ARG_WITH(fonts,
- AS_HELP_STRING([--without-fonts],
- [LibO includes some third-party fonts to provide a reliable basis for
- help content, templates, samples, etc. When these fonts are already
- known to be available on the system then you should use this option.]),
-,)
-
AC_ARG_WITH(ppds,
AS_HELP_STRING([--without-ppds],
[Removes Postscript Printer definition files from LibreOffice
@@ -7496,7 +7497,7 @@ dnl ===================================================================
dnl Test whether to include fonts
dnl ===================================================================
AC_MSG_CHECKING([whether to include third-party fonts])
-if test "$with_fonts" != "no" ; then
+if test "x$enable_fonts" = "xyes" -o "x$enable_extra_fonts" = "xyes"; then
AC_MSG_RESULT([yes])
WITH_FONTS=YES
BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
@@ -7508,6 +7509,22 @@ fi
AC_SUBST(WITH_FONTS)
dnl ===================================================================
+dnl Test whether to include extra fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include additional fonts])
+if test "x$enable_extra_fonts" = "xyes" ; then
+ AC_MSG_RESULT([yes])
+ WITH_EXTRA_FONT=YES
+ BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+ SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+else
+ AC_MSG_RESULT([no])
+ WITH_EXTRA_FONT=NO
+fi
+AC_SUBST(WITH_EXTRA_FONT)
+AC_SUBST(SCPDEFS)
+
+dnl ===================================================================
dnl Test whether to include ppds
dnl ===================================================================
AC_MSG_CHECKING([whether to include PPDs])
@@ -7579,22 +7596,8 @@ else
fi
AC_SUBST(WITH_EXTRA_SAMPLE)
-dnl ===================================================================
-dnl Test whether to include extra fonts
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include extra fonts])
-if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
- AC_MSG_RESULT([no])
- WITH_EXTRA_FONT=NO
-else
- AC_MSG_RESULT([yes])
- WITH_EXTRA_FONT=YES
- BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
- SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
-fi
-AC_SUBST(WITH_EXTRA_FONT)
-AC_SUBST(SCPDEFS)
+
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([whether to enable ActiveX embedding of LibO components])
--
1.7.1
Sebastian
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
