d255b67972
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct: configure.ac: AC_CONFIG_MACRO_DIR([m4]) Makefile.am: ACLOCAL_AMFLAGS="-I m4" If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663 Don't use the "-I" option in aclocal. Instead use ACLOCAL_PATH to pass the system-wide include dirs. As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the ACLOCAL_HOST_DIR system include path. autoreconf will pass the "-I" options to every tool it runs, of which aclocal, which, as seen above, we don't want. So move the argument down to each individual tool, except for aclocal. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> [yann.morin.1998@free.fr: slight rewording of the commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
27 lines
972 B
Makefile
27 lines
972 B
Makefile
################################################################################
|
|
#
|
|
# autoconf
|
|
#
|
|
################################################################################
|
|
|
|
AUTOCONF_VERSION = 2.69
|
|
AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
|
|
AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
|
|
|
|
AUTOCONF_LICENSE = GPL-3.0+ with exceptions
|
|
AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
|
|
|
|
HOST_AUTOCONF_CONF_ENV = \
|
|
EMACS="no" \
|
|
ac_cv_path_M4=$(HOST_DIR)/bin/m4 \
|
|
ac_cv_prog_gnu_m4_gnu=no
|
|
|
|
HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
|
|
|
|
$(eval $(host-autotools-package))
|
|
|
|
# variables used by other packages
|
|
AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
|
|
AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
|
|
AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
|