summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-12-01 11:18:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-12-01 11:21:55 (GMT)
commit9d998ad1d79ffb6f878a55c8f2ed60fe7e973f34 (patch)
tree84ac1ba13f3c6a740d63d5f805ebb4a3c464049c
parentc14fb7c1dde86df909e00d2671b2ccf98485cf30 (diff)
downloadbuildroot-9d998ad1d79ffb6f878a55c8f2ed60fe7e973f34.tar.gz
buildroot-9d998ad1d79ffb6f878a55c8f2ed60fe7e973f34.tar.bz2
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>
-rw-r--r--CHANGES4
-rw-r--r--package/autoconf/autoconf.mk5
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 1452823..6e5eef3 100644
--- 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 d3ef136..32f10e3 100644
--- 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" \