* xorg-lib-SM.make, xorg-lib-Xmu.make, xorg-lib-X11.make, xorg-app-xhost.make, xorg-lib-ICE.make:

	used centralized XORG_OPTIONS_TRANS option


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6829 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 12 insertions, 93 deletions

diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make
index e391c1023..a56f92747 100644
--- a/rules/xorg-app-xhost.make
+++ b/rules/xorg-app-xhost.make
@@ -65,27 +65,10 @@ XORG_APP_XHOST_ENV 	:=  $(CROSS_ENV)
 # autoconf
 #
 XORG_APP_XHOST_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-dependency-tracking \
 	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
-XORG_APP_XHOST_AUTOCONF += --enable-unix-transport
-else
-XORG_APP_XHOST_AUTOCONF += --disable-unix-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP
-XORG_APP_XHOST_AUTOCONF += --enable-tcp-transport
-else
-XORG_APP_XHOST_AUTOCONF += --disable-tcp-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_APP_XHOST_AUTOCONF += --enable-IPv6
-else
-XORG_APP_XHOST_AUTOCONF += --disable-IPv6
-endif
-
 ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC
 XORG_APP_XHOST_AUTOCONF += --enable-secure-rpc
 else
diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make
index 8552a7ee9..0ab8ece6d 100644
--- a/rules/xorg-lib-ICE.make
+++ b/rules/xorg-lib-ICE.make
@@ -64,27 +64,11 @@ XORG_LIB_ICE_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_LIB_ICE_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+XORG_LIB_ICE_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-dependency-tracking
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
-XORG_LIB_ICE_AUTOCONF	+= --enable-unix-transport
-else
-XORG_LIB_ICE_AUTOCONF	+= --disable-unix-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP
-XORG_LIB_ICE_AUTOCONF	+= --enable-tcp-transport
-else
-XORG_LIB_ICE_AUTOCONF	+= --disable-tcp-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_LIB_ICE_AUTOCONF	+= --enable-ipv6
-else
-XORG_LIB_ICE_AUTOCONF	+= --disable-ipv6
-endif
-
 $(STATEDIR)/xorg-lib-ICE.prepare: $(xorg-lib-ICE_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(XORG_LIB_ICE_DIR)/config.cache)
diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make
index 92be5cc17..990121695 100644
--- a/rules/xorg-lib-SM.make
+++ b/rules/xorg-lib-SM.make
@@ -64,27 +64,11 @@ XORG_LIB_SM_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_LIB_SM_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+XORG_LIB_SM_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-dependency-tracking
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
-XORG_LIB_SM_AUTOCONF	+= --enable-unix-transport
-else
-XORG_LIB_SM_AUTOCONF	+= --disable-unix-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP
-XORG_LIB_SM_AUTOCONF	+= --enable-tcp-transport
-else
-XORG_LIB_SM_AUTOCONF	+= --disable-tcp-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_LIB_SM_AUTOCONF	+= --enable-ipv6
-else
-XORG_LIB_SM_AUTOCONF	+= --disable-ipv6
-endif
-
 $(STATEDIR)/xorg-lib-SM.prepare: $(xorg-lib-SM_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(XORG_LIB_SM_DIR)/config.cache)
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index b5666feff..20e5e36cd 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -66,6 +66,7 @@ XORG_LIB_X11_ENV 	:=  $(CROSS_ENV)
 #
 XORG_LIB_X11_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-malloc0returnsnull \
 	--disable-dependency-tracking \
 	--disable-man-pages
@@ -76,23 +77,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_XORG_DEFAULT_DATA_DIR)),)
 	XORG_LIB_X11_AUTOCONF   += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
 endif
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
-XORG_LIB_X11_AUTOCONF	+= --enable-unix-transport
-else
-XORG_LIB_X11_AUTOCONF	+= --disable-unix-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP
-XORG_LIB_X11_AUTOCONF	+= --enable-tcp-transport
-else
-XORG_LIB_X11_AUTOCONF	+= --disable-tcp-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_LIB_X11_AUTOCONF	+= --enable-ipv6
-else
-XORG_LIB_X11_AUTOCONF	+= --disable-ipv6
-endif
 #
 # feature is marked as experimental if disabled!
 #
@@ -148,7 +132,7 @@ xorg-lib-X11_compile: $(STATEDIR)/xorg-lib-X11.compile
 
 $(STATEDIR)/xorg-lib-X11.compile: $(xorg-lib-X11_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_LIB_X11_DIR) && $(XORG_LIB_X11_PATH) $(XORG_LIB_X11_ENV) $(MAKE) $(PARALLELMFLAGS)
+	cd $(XORG_LIB_X11_DIR) && $(XORG_LIB_X11_PATH) $(MAKE) $(PARALLELMFLAGS) $(CROSS_ENV_CC_FOR_BUILD)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make
index 64bde43df..54483a1ae 100644
--- a/rules/xorg-lib-Xmu.make
+++ b/rules/xorg-lib-Xmu.make
@@ -64,27 +64,11 @@ XORG_LIB_XMU_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-XORG_LIB_XMU_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+XORG_LIB_XMU_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-dependency-tracking
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_LIB_XMU_AUTOCONF	+= --enable-ipv6
-else
-XORG_LIB_XMU_AUTOCONF	+= --disable-ipv6
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
-XORG_LIB_XMU_AUTOCONF	+= --enable-unix-transport
-else
-XORG_LIB_XMU_AUTOCONF	+= --disable-unix-transport
-endif
-
-ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP
-XORG_LIB_XMU_AUTOCONF	+= --enable-tcp-transport
-else
-XORG_LIB_XMU_AUTOCONF	+= --disable-tcp-transport
-endif
-
 $(STATEDIR)/xorg-lib-Xmu.prepare: $(xorg-lib-Xmu_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(XORG_LIB_XMU_DIR)/config.cache)