[PATCH] Make it possible to disable the type1 font module
Julien Cristau
jcristau at debian.org
Fri Jul 6 11:15:39 PDT 2007
Hi,
This patch adds a configure option to disable the type1 module.
It might make sense to change the default value to no, or to remove that
module completely (it doesn't add anything that freetype doesn't have,
as I understand it, since cid support was removed).
Cheers,
Julien
---
configure.ac | 8 ++++++++
hw/xfree86/dixmods/Makefile.am | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 760db87..991705f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -473,6 +473,11 @@ AC_ARG_ENABLE(builtin-fonts, AS_HELP_STRING([--enable-builtin-fonts], [Use only
AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
[NULL_ROOT_CURSOR=$enableval],
[NULL_ROOT_CURSOR=no])
+AC_ARG_ENABLE(type1,
+ AS_HELP_STRING([--disable-type1],
+ [Build the type1 font module (default: enabled)]),
+ [TYPE1=$enableval],
+ [TYPE1=yes])
dnl GLX build options
AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
@@ -606,6 +611,9 @@ XORG_CHECK_LINUXDOC
dnl Handle installing libxf86config
AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
+dnl Handle building the type1 module
+AM_CONDITIONAL(BUILD_TYPE1, [test "x$TYPE1" = xyes])
+
dnl ---------------------------------------------------------------------------
dnl Extension section
dnl ---------------------------------------------------------------------------
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 06e6d40..135c449 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -40,8 +40,11 @@ extsmodule_LTLIBRARIES = librecord.la \
$(XTRAPMOD)
fontsmoduledir = $(moduledir)/fonts
-fontsmodule_LTLIBRARIES = libfreetype.la \
- libtype1.la
+fontsmodule_LTLIBRARIES = libfreetype.la
+
+if BUILD_TYPE1
+fontsmodule_LTLIBRARIES += libtype1.la
+endif
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
@@ -104,8 +107,10 @@ libshadow_la_SOURCES = shmodule.c
libfreetype_la_LDFLAGS = -avoid-version
libfreetype_la_SOURCES = ftmodule.c
+if BUILD_TYPE1
libtype1_la_LDFLAGS = -avoid-version
libtype1_la_SOURCES = type1mod.c
+endif
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
--
1.5.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20070706/8b6c5d06/attachment.pgp>
More information about the xorg
mailing list