summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/xorg-lib-AppleWM.in4
-rw-r--r--rules/xorg-lib-AppleWM.make2
-rw-r--r--rules/xorg-lib-X11.make2
-rw-r--r--rules/xorg-lib-Xext.make2
-rw-r--r--rules/xorg-lib-Xt.make2
-rw-r--r--rules/xorg-lib-dmx.in4
-rw-r--r--rules/xorg-lib-dmx.make2
-rw-r--r--rules/xorg-lib-fontenc.in1
8 files changed, 16 insertions, 3 deletions
diff --git a/rules/xorg-lib-AppleWM.in b/rules/xorg-lib-AppleWM.in
index f101e4e8b..286f3b823 100644
--- a/rules/xorg-lib-AppleWM.in
+++ b/rules/xorg-lib-AppleWM.in
@@ -1,6 +1,10 @@
config XORG_LIB_APPLEWM
bool
depends on XORG_LIB
+ select XORG_PROTO_APPLEWM
+ select XORG_LIB_X11
+ select XORG_LIB_XEXT
+ select XORG_PROTO_XEXT
prompt "libAppleWM"
help
FIXME
diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make
index ad71ffdef..167f3b5df 100644
--- a/rules/xorg-lib-AppleWM.make
+++ b/rules/xorg-lib-AppleWM.make
@@ -67,6 +67,8 @@ XORG_LIB_APPLEWM_ENV := $(CROSS_ENV)
#
XORG_LIB_APPLEWM_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_LIB_APPLEWM_AUTOCONF += --disable-malloc0returnsnull
+
$(STATEDIR)/xorg-lib-AppleWM.prepare: $(xorg-lib-AppleWM_prepare_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(XORG_LIB_APPLEWM_DIR)/config.cache)
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index a71b15c96..b35e06879 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -67,7 +67,7 @@ XORG_LIB_X11_ENV := $(CROSS_ENV)
#
XORG_LIB_X11_AUTOCONF := $(CROSS_AUTOCONF_USR)
-XORG_LIB_X11_AUTOCONF += --enable-malloc0returnsnull
+XORG_LIB_X11_AUTOCONF += --disable-malloc0returnsnull
$(STATEDIR)/xorg-lib-X11.prepare: $(xorg-lib-X11_prepare_deps_default)
@$(call targetinfo, $@)
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index c04dcbcbf..91029f0c2 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -67,7 +67,7 @@ XORG_LIB_XEXT_ENV := $(CROSS_ENV)
#
XORG_LIB_XEXT_AUTOCONF := $(CROSS_AUTOCONF_USR)
-XORG_LIB_XEXT_AUTOCONF += --enable-malloc0returnsnull
+XORG_LIB_XEXT_AUTOCONF += --disable-malloc0returnsnull
$(STATEDIR)/xorg-lib-Xext.prepare: $(xorg-lib-Xext_prepare_deps_default)
@$(call targetinfo, $@)
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index cc9caffd1..c0cf58b31 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -67,7 +67,7 @@ XORG_LIB_XT_ENV := $(CROSS_ENV)
#
XORG_LIB_XT_AUTOCONF := $(CROSS_AUTOCONF_USR)
-XORG_LIB_XT_AUTOCONF += --enable-malloc0returnsnull
+XORG_LIB_XT_AUTOCONF += --disable-malloc0returnsnull
$(STATEDIR)/xorg-lib-Xt.prepare: $(xorg-lib-Xt_prepare_deps_default)
@$(call targetinfo, $@)
diff --git a/rules/xorg-lib-dmx.in b/rules/xorg-lib-dmx.in
index 02ad4aa29..3bf43fc22 100644
--- a/rules/xorg-lib-dmx.in
+++ b/rules/xorg-lib-dmx.in
@@ -1,6 +1,10 @@
config XORG_LIB_DMX
bool
depends on XORG_LIB
+ select XORG_LIB_X11
+ select XORG_LIB_XEXT
+ select XORG_PROTO_XEXT
+ select XORG_PROTO_DMX
prompt "libdmx"
help
FIXME
diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make
index 441ed4099..987b90b79 100644
--- a/rules/xorg-lib-dmx.make
+++ b/rules/xorg-lib-dmx.make
@@ -67,6 +67,8 @@ XORG_LIB_DMX_ENV := $(CROSS_ENV)
#
XORG_LIB_DMX_AUTOCONF := $(CROSS_AUTOCONF_USR)
+XORG_LIB_DMX_AUTOCONF += --disable-malloc0returnsnull
+
$(STATEDIR)/xorg-lib-dmx.prepare: $(xorg-lib-dmx_prepare_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(XORG_LIB_DMX_DIR)/config.cache)
diff --git a/rules/xorg-lib-fontenc.in b/rules/xorg-lib-fontenc.in
index 1d7addbf2..db73d2ffd 100644
--- a/rules/xorg-lib-fontenc.in
+++ b/rules/xorg-lib-fontenc.in
@@ -1,6 +1,7 @@
config XORG_LIB_
bool
depends on XORG_LIB
+ select ZLIB
prompt "libfontenc"
help
FIXME