2002-10-08 Roland McGrath <roland@redhat.com>

	* 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

@@ -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
 

Makefile

@@ -30,29 +30,33 @@ include Makeconfig
 .PHONY: all
 all: lib others
 
+ifneq ($(AUTOCONF),no)
+
 ifeq ($(with-cvs),yes)
-define autoconf-it
-@-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.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
 @-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
+$(AUTOCONF) $(ACFLAGS) $< > $@.new
 chmod a-w,a+x $@.new
 mv -f $@.new $@
+$(autoconf-it-cvs)
 endef
-endif
-
-# We don't want to run anything here in parallel.
-.NOTPARALLEL:
 
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)
 
+endif # $(AUTOCONF) = no
+
+
+# We don't want to run anything here in parallel.
+.NOTPARALLEL:
+
 # These are the targets that are made by making them in each subdirectory.
 +subdir_targets	:= subdir_lib objects objs others subdir_mostlyclean	\
 		   subdir_clean subdir_distclean subdir_realclean	\

config.make.in

@@ -90,6 +90,7 @@ AS = $(CC) -c
 MIG = @MIG@
 PWD_P = @PWD_P@
 BISON = @BISON@
+AUTOCONF = @AUTOCONF@
 
 # Installation tools.
 INSTALL = @INSTALL@