[kirkwood] enable mach support for OpenRD Base and OpenRD Client (#8417), spare the...

[openwrt.git] / include / autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index a1a5d5d..4a7c10b 100644 (file)
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -6,6 +6,8 @@
 #
 
 PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
 #
 
 PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)

+PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
+PKG_REMOVE_FILES?=aclocal.m4

 
 autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 
 
 autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 


@@ -17,13 +19,19 @@ endef
 
 define autoreconf
        (cd $(PKG_BUILD_DIR); \
 
 define autoreconf
        (cd $(PKG_BUILD_DIR); \

-               if [ -x ./autogen.sh ]; then \
-                       ./autogen.sh || true; \
-               elif [ -f ./configure.ac ] || [ -f ./configure.in ]; then \
-                       rm -f ./GNUmakefile; \
-                       $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
-                               $(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
-               fi \
+               $(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \
+               $(foreach p,$(PKG_AUTOMAKE_PATHS), \
+                       if [ -x $(p)/autogen.sh ]; then \
+                               $(p)/autogen.sh || true; \
+                       elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
+                               [ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
+                               [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
+                               $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+                                       -B $(STAGING_DIR_HOST)/share/aclocal \
+                                       -B $(STAGING_DIR)/host/share/aclocal \
+                                       $(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
+                       fi; \
+               ) \

        );
 endef
 
        );
 endef
 


@@ -43,3 +51,8 @@ ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
  endif
 endif
 
  endif
 endif
 

+ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
+  ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),)
+    Hooks/Configure/Pre += autoreconf
+  endif
+endif