summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2010-10-07 17:31:06 +0200
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-10-07 17:17:09 -0700
commit62529733e57b6d6c775b1bcf584260b1cff6af5c (patch)
tree1ed729e49a27e26183488563a76dbfe2ab6ea23f
parent7757000fca0f7fc6d966eb1f45c226862ed8e489 (diff)
downloadxorg-font-util-62529733e57b6d6c775b1bcf584260b1cff6af5c.tar.gz
fontutil.m4: Add a shorthand --disable-all-encodings option.
This option is useful to disable all possible font encodings at once, without fine-graining the calling ebuilds for a list of encodings supported by each font package. The option is parsed before all other encoding options, so it basically sets defaults for all of them. Afterwards, any encoding can be re-enabled back using '--enable-<encoding>' (much like '--disable-all-encodings --enable-iso8859-2'). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--fontutil.m4.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/fontutil.m4.in b/fontutil.m4.in
index c867ea6..6c0d132 100644
--- a/fontutil.m4.in
+++ b/fontutil.m4.in
@@ -114,7 +114,7 @@ AC_DEFUN([XORG_FONT_CHECK_ENCODING],[
AC_ARG_ENABLE(m4_tolower($1),
AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)),
[Build $1 fonts (default: yes)]),
- [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes])
+ [AS_TR_SH($1)=$enableval])
AC_MSG_CHECKING([whether to build $1 fonts])
AC_MSG_RESULT($[AS_TR_SH($1)])
AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes])
@@ -123,9 +123,19 @@ AC_DEFUN([XORG_FONT_CHECK_ENCODING],[
# XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....)
# -----------------------------------------------------
# Minimum version: 1.1.0
-# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once
+# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once.
+# Add a shorthand --enable/disable-all-encodings option.
AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[
+ AC_ARG_ENABLE([all-encodings],
+ AS_HELP_STRING([--disable-all-encodings],
+ [Disable building of all font encodings]),
+ [m4_foreach_w([enc], [$1], [
+ AS_TR_SH(enc)=$enableval
+ ])],
+ [m4_foreach_w([enc], [$1], [
+ AS_TR_SH(enc)=yes
+ ])])
m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)])
]) # XORG_FONT_CHECK_ENCODING_LIST