removed xorg keyboard driver patches, not needed since [8933]

[openwrt/svn-archive/archive.git] / XOrg / driver / common.mk

diff --git a/XOrg/driver/common.mk b/XOrg/driver/common.mk
index b5f7a2ac293a71639158e96e9f99a054c13eee37..110dc441874ac13cd9979ec0223e143d371f772f 100644 (file)
--- a/XOrg/driver/common.mk
+++ b/XOrg/driver/common.mk
@@ -12,12 +12,15 @@ _CATEGORY:=driver
 _DEPEND+=+xorg-server-X11R7.2
 include ../../common.mk
 
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-endef
-
 EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/xorg -I${STAGING_DIR}/usr/include/X11/
 
+CONFIGURE_VARS+=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/"
+
+acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
+
+CONFIGURE_VARS += $(foreach a,dri.h sarea.h dristruct.h exa.h,ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes) \
+               ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
        if [ -x $(CONFIGURE_CMD) ]; then \
@@ -25,16 +28,18 @@ define Build/Configure
                $(CONFIGURE_VARS) \
                $(CONFIGURE_CMD) \
                $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               as_ac_File=no \
-               --enable-malloc0returnsnull; \
+               $(CONFIGURE_ARGS) ;\
        fi \
        )
 endef
 
-define Package/${PKG_NAME}/install
+define Build/Compile
+       make -C $(PKG_BUILD_DIR)
        DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
+endef
+
+define Package/${PKG_NAME}/install
        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-       find $(1)/usr/lib/ -name *a | xargs rm -rf
 endef