package/autoconf: hardcode m4 config

Hardcode m4 config instead of letting configure detect it automatically.
This hopefully fixes the build issues some (Ubuntu) users seems to be
having lately (E.G. #679).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 145282362b5a7cf550276f100f589f94acb001d5..6e5eef3146bf305f30e0212e16b60cbbd4e66790 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,8 @@
 
        Additional fixes and cleanups.
 
-       Updated/fixed packages: alsamixergui, coreutils, fltk, microperl,
-       ncurses, vim
+       Updated/fixed packages: alsamixergui, autoconf, coreutils, fltk,
+       microperl, ncurses, vim
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index d3ef13608cb7400b4b14a807f9adbe695e92edc4..32f10e385bf7c0ad30205b99901c60dada4858e6 100644 (file)
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -11,7 +11,8 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOCONF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif
 
-AUTOCONF_CONF_ENV = EMACS="no"
+AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+                   ac_cv_prog_gnu_m4_gnu=no
 
 AUTOCONF_DEPENDENCIES = microperl
 
@@ -39,6 +40,8 @@ $(STAMP_DIR)/host_autoconf_configured: $(STAMP_DIR)/host_autoconf_unpacked $(STA
                $(HOST_CONFIGURE_OPTS) \
                CFLAGS="$(HOST_CFLAGS)" \
                LDFLAGS="$(HOST_LDFLAGS)" \
+               ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+               ac_cv_prog_gnu_m4_gnu=no \
                ./configure $(QUIET) \
                --prefix="$(HOST_DIR)/usr" \
                --sysconfdir="$(HOST_DIR)/etc" \