From ab6cd253daebc2976fbbf58a359fa01152197445 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Tue, 16 May 2017 15:39:35 +0800 Subject: [PATCH] build: workaround build failures with old autoconf version Xiao Yang reported that fstests failed to build on RHEL6.9 hosts due to old autoreconf didn't pass -I to aclocal -I. (This was fixed by autoconf commit 44fbeef86d03 ("Pass autoreconf -I to aclocal -I"), but not on RHEL6.9). So call aclocal, autoheader and autoconf directly instead of autoreconf, as what's done in xfsprogs Makefile. Reported-by: Xiao Yang Reviewed-by: Xiao Yang Signed-off-by: Eryu Guan --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ebf5c03b..d97385f9 100644 --- a/Makefile +++ b/Makefile @@ -41,13 +41,13 @@ endif SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz -CONFIGURE = configure include/builddefs include/config.h \ +CONFIGURE = configure include/config.h include/config.h.in \ aclocal.m4 config.guess config.sub install-sh ltmain.sh \ m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \ m4/lt~obsolete.m4 LSRCFILES = configure configure.ac aclocal.m4 README VERSION LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \ - conftest* check.log check.time libtool + conftest* check.log check.time libtool include/builddefs ifeq ($(HAVE_BUILDDEFS), yes) LDIRT += $(SRCTAR) @@ -79,8 +79,10 @@ clean: # if configure hasn't run, nothing to clean endif configure: configure.ac - autoreconf --include=m4 - libtoolize -i + libtoolize -cfi + aclocal -I m4 + autoheader + autoconf include/builddefs include/config.h: configure ./configure \ -- 2.47.3