[include] autotools.mk: remove HOST_BUILD_DEPENDS on libtool

[openwrt/svn-archive/archive.git] / include / autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index 308b45a5f3a2e572956c2ed8f7b204b62024df28..5e1c1053e487a78e7fcb0b459d041773ac759d26 100644 (file)
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -21,7 +21,8 @@ AM_TOOL_PATHS:= \
        ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
        AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
        LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
-       M4=$(STAGING_DIR_HOST)/bin/m4
+       M4=$(STAGING_DIR_HOST)/bin/m4 \
+       AUTOPOINT=true
 
 # 1: build dir
 # 2: remove files
@@ -32,15 +33,14 @@ define autoreconf
        (cd $(1); \
                $(patsubst %,rm -f %;,$(2)) \
                $(foreach p,$(3), \
-                       if [ -x $(p)/autogen.sh ]; then \
-                               $(AM_TOOL_PATHS) $(p)/autogen.sh || true; \
-                       elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
+                       if [ -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; \
+                               touch NEWS AUTHORS COPYING ChangeLog; \
                                $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
                                        -B $(STAGING_DIR_HOST)/share/aclocal \
                                        $(patsubst %,-B %,$(5)) \
-                                       $(patsubst %,-I %,$(4)) $(4) || true; \
+                                       $(patsubst %,-I %,$(4)) -I m4 $(4) || true; \
                        fi; \
                ) \
        );
@@ -93,14 +93,12 @@ define autoreconf_host
 endef
 
 ifneq ($(filter libtool,$(HOST_FIXUP)),)
-  HOST_BUILD_DEPENDS += libtool
  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif
 endif
 
 ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
-  HOST_BUILD_DEPENDS += libtool
  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif