summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/xorg-font-speedo.in1
-rw-r--r--rules/xorg-font-type1.in1
-rw-r--r--rules/xorg-lib-Xfont.in21
-rw-r--r--rules/xorg-lib-Xfont.make18
4 files changed, 0 insertions, 41 deletions
diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in
index c319915f2..915ef0aad 100644
--- a/rules/xorg-font-speedo.in
+++ b/rules/xorg-font-speedo.in
@@ -2,7 +2,6 @@
menuconfig XORG_FONT_SPEEDO
depends on MENU_XORG_FONTS
- select XORG_LIB_XFONT_SPEEDO_FONTS
bool
prompt "xorg speedo fonts "
diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in
index bdd30ad65..3ba10059a 100644
--- a/rules/xorg-font-type1.in
+++ b/rules/xorg-font-type1.in
@@ -2,7 +2,6 @@
menuconfig XORG_FONT_TYPE1
depends on MENU_XORG_FONTS
- select XORG_LIB_XFONT_TYPE1_FONTS
bool
prompt "xorg scalable fonts "
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
index a35b6f0b8..5eb79db02 100644
--- a/rules/xorg-lib-Xfont.in
+++ b/rules/xorg-lib-Xfont.in
@@ -35,27 +35,6 @@ config XORG_LIB_XFONT_FONTSERVER
This will support connections to font server.
FIXME: xorg server fails when font server connections are disabled.
-config XORG_LIB_XFONT_TYPE1_FONTS
- depends on XORG_LIB_XFONT
- bool
- prompt "Support type1 fonts"
- help
- Enable Type 1 fonts in this X server.
-
-config XORG_LIB_XFONT_CID_FONTS
- depends on XORG_LIB_XFONT
- bool
- prompt "Support CID fonts"
- help
- Enable CID fonts in this X server.
-
-config XORG_LIB_XFONT_SPEEDO_FONTS
- depends on XORG_LIB_XFONT
- bool
- prompt "Support Speedo fonts"
- help
- Enable Speedo fonts in this X server.
-
config XORG_LIB_XFONT_PCF_FONTS
depends on XORG_LIB_XFONT
bool
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index 0a64abe9e..59dfa9d2c 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -63,24 +63,6 @@ else
XORG_LIB_XFONT_AUTOCONF += --disable-fc
endif
-ifdef PTXCONF_XORG_LIB_XFONT_TYPE1_FONTS
-XORG_LIB_XFONT_AUTOCONF += --enable-type1
-else
-XORG_LIB_XFONT_AUTOCONF += --disable-type1
-endif
-
-ifdef PTXCONF_XORG_LIB_XFONT_CID_FONTS
-XORG_LIB_XFONT_AUTOCONF += --enable-cid
-else
-XORG_LIB_XFONT_AUTOCONF += --disable-cid
-endif
-
-ifdef PTXCONF_XORG_LIB_XFONT_SPEEDO_FONTS
-XORG_LIB_XFONT_AUTOCONF += --enable-speedo
-else
-XORG_LIB_XFONT_AUTOCONF += --disable-speedo
-endif
-
ifdef PTXCONF_XORG_LIB_XFONT_PCF_FONTS
XORG_LIB_XFONT_AUTOCONF += --enable-pcfformat
else