diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 14:28:45 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-11 14:28:45 +0000 |
| commit | 51ed3bfea1cc8b1426b6fa0c22db4c193b502c3f (patch) | |
| tree | 114e95409c381f02ae4b8e9947725055c0e3c9e3 /rules/xorg-lib-X11.make | |
| parent | e2e13eb39e2da088ba9458ec1a951c26d6a844f6 (diff) | |
| download | ptxdist-51ed3bfea1cc8b1426b6fa0c22db4c193b502c3f.tar.gz ptxdist-51ed3bfea1cc8b1426b6fa0c22db4c193b502c3f.tar.xz | |
* 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
Diffstat (limited to 'rules/xorg-lib-X11.make')
| -rw-r--r-- | rules/xorg-lib-X11.make | 20 |
1 files changed, 2 insertions, 18 deletions
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, $@) # ---------------------------------------------------------------------------- |