[backfire] merge r23029, r23030, r23031 and r23032

[openwrt-10.03/.git] / include / autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index f85026a944a496c67c9fa9a1f092d0a126e2c9fe..c941a4949d09a0f1d8a036b4c709e81f54f49b19 100644 (file)
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -32,15 +32,13 @@ update_libtool_ucxx = \
        ) \
        $(call update_libtool_common)
 
+autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 
 # prevent libtool from linking against host development libraries
 define libtool_fixup_libdir
        find $(1) -name '*.la' | $(XARGS) \
                $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
                    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
-       find $(2) -name '*.la' | $(XARGS) \
-               $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
-                   -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g"
 endef
 
 define remove_version_check