[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.30,1.31

[Neil Schemenauer]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv15295

Modified Files:
	Makefile.pre.in 
Log Message:
- Remove WITH makefile variable.  Its not used for anything.
- Add CONFIG_ARGS variable and use it to re-run configure rather than
  using config.status.  This prevents an infinite loop if configure
  dies while re-configuring.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** Makefile.pre.in	2001/03/16 11:50:43	1.30
--- Makefile.pre.in	2001/03/22 00:32:32	1.31
***************
*** 106,113 ****
  FILEMODE=	644
  
! # --with-PACKAGE options for configure script
! # e.g. --with-readline --with-svr5 --with-solaris --with-thread
! # (see README for an explanation)
! WITH=		
  
  
--- 106,111 ----
  FILEMODE=	644
  
! # configure script arguments
! CONFIG_ARGS=	@CONFIG_ARGS@
  
  
***************
*** 710,723 ****
  	$(MAKE) -f Makefile.pre Makefile
  
! # Run the configure script.  If config.status already exists,
! # call it with the --recheck argument, which reruns configure with the
! # same options as it was run last time; otherwise run the configure
! # script with options taken from the $(WITH) variable
  config.status:	$(srcdir)/configure
! 	if test -f config.status; \
! 	then $(SHELL) config.status --recheck; \
! 	     $(SHELL) config.status; \
! 	else $(SHELL) $(srcdir)/configure $(WITH); \
! 	fi
  
  .PRECIOUS: config.status $(PYTHON) Makefile Makefile.pre
--- 708,714 ----
  	$(MAKE) -f Makefile.pre Makefile
  
! # Run the configure script.
  config.status:	$(srcdir)/configure
! 	$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
  
  .PRECIOUS: config.status $(PYTHON) Makefile Makefile.pre