From 1400de2e9c706bc2ff357be7f84910723b84fb33 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 8 Oct 2002 08:44:09 +0000 Subject: 2002-10-08 Roland McGrath * configure.in (AUTOCONF): New check to set it. Set to "no" if the one found doesn't work on our configure.in. * configure: Regenerated. * config.make.in (AUTOCONF): New substituted variable. * Makefile (autoconf-it-cvs): New canned sequence, broken out of ... (autoconf-it): ... here, use that instead of defining conditionally. Use $(AUTOCONF) instead of literal autoconf. [$(AUTOCONF) != no] (configure, %/configure): Protect these rules with this condition. * Make-dist (autoconf-it, configure, %/configure): Copy those changes. --- Make-dist | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'Make-dist') diff --git a/Make-dist b/Make-dist index 9417904287..00c4d154a3 100644 --- a/Make-dist +++ b/Make-dist @@ -190,22 +190,30 @@ foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2) +tsrcs := $(+tsrcs) $(+sysdep-tsrcs) $(wildcard $(+sysdep-names:%=include/%)) +ifneq ($(AUTOCONF),no) + ifeq ($(with-cvs),yes) -define autoconf-it -autoconf $(ACFLAGS) $< > $@.new -mv -f $@.new $@ +define autoconf-it-cvs test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@ endef else +autoconf-it-cvs = +endif + define autoconf-it -autoconf $(ACFLAGS) $< > $@.new +@-rm -f $@.new +$(AUTOCONF) $(ACFLAGS) $< > $@.new +chmod a-w,a+x $@.new mv -f $@.new $@ +$(autoconf-it-cvs) endef -endif configure: configure.in aclocal.m4; $(autoconf-it) %/configure: %/configure.in aclocal.m4; $(autoconf-it) +endif # $(AUTOCONF) = no + + dist: $(tardir).tar.bz2 rm $(tardir).tar -- cgit v1.2.3