extra/tools: make sure autoconf can access pkg-config macros

[vlc] / extras / tools / tools.mak

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 68267cb62f4becd7fd25d2ebec102c41154c45b3..4e79da78cd9d4292281061070e5934de3e2c3c1f 100644 (file)
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -8,6 +8,9 @@ include packages.mak
 # common rules
 #
 
+AUTOCONF=$(PREFIX)/bin/autoconf
+export AUTOCONF
+
 ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
 download = curl -f -L -- "$(1)" > "$@"
 else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
@@ -129,7 +132,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
        $(UNPACK)
        $(MOVE)
 
-.autoconf: autoconf
+.autoconf: autoconf .pkg-config
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
        touch $@
 
@@ -159,10 +162,10 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 pkg-config-$(PKGCFG_VERSION).tar.gz:
        $(download) $(PKGCFG_URL)
 
-pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
+pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz .autoconf
        $(UNPACK)
        $(MOVE)
-       (cd $@; autoconf)
+       (cd $@; $(AUTOCONF))
 
 .pkg-config: pkgconfig
        (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)