summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEryu Guan <eguan@redhat.com>2017-05-16 15:39:35 +0800
committerEryu Guan <eguan@redhat.com>2017-06-02 11:15:40 +0800
commitab6cd253daebc2976fbbf58a359fa01152197445 (patch)
tree5957227c49b062eebbfede5a8e8e41fab7de6894 /Makefile
parentf12193300a13159e5bb46b58072287cca5df8dc6 (diff)
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 <yangx.jy@cn.fujitsu.com> Reviewed-by: Xiao Yang <yangx.jy@cn.fujitsu.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files 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 \