X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fautotools.mk;h=5e1c1053e487a78e7fcb0b459d041773ac759d26;hb=70c7d27720c1a555544c1dcf20e34b27d20dead1;hp=2ab42df61fff471f4b1e905209bee0845b8361f5;hpb=bd538b10cbea38ac7d3362e91110c9d56e477987;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/include/autotools.mk b/include/autotools.mk
index 2ab42df61f..5e1c1053e4 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -13,6 +13,17 @@ define libtool_remove_files
 	find $(1) -name '*.la' | $(XARGS) rm -f;
 endef
 
+
+AM_TOOL_PATHS:= \
+	AUTOM4TE=$(STAGING_DIR_HOST)/bin/autom4te \
+	AUTOCONF=$(STAGING_DIR_HOST)/bin/autoconf \
+	AUTOMAKE=$(STAGING_DIR_HOST)/bin/automake \
+	ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
+	AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
+	LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
+	M4=$(STAGING_DIR_HOST)/bin/m4 \
+	AUTOPOINT=true
+
 # 1: build dir
 # 2: remove files
 # 3: automake paths
@@ -22,15 +33,14 @@ define autoreconf
 	(cd $(1); \
 		$(patsubst %,rm -f %;,$(2)) \
 		$(foreach p,$(3), \
-			if [ -x $(p)/autogen.sh ]; then \
-				$(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; \
-				$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+				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; \
 		) \
 	);
@@ -83,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