nobu	2010-11-18 07:37:48 +0900 (Thu, 18 Nov 2010)

  New Revision: 29825

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29825

  Log:
    * Makefile.in (reconfig): force reconfigure with previous options.
    * common.mk (showconfig): show configure flags, like as
      `config.status --config' generated by recent autoconf.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29824)
+++ ChangeLog	(revision 29825)
@@ -1,3 +1,10 @@
+Thu Nov 18 07:37:44 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (reconfig): force reconfigure with previous options.
+
+	* common.mk (showconfig): show configure flags, like as
+	  `config.status --config' generated by recent autoconf.
+
 Thu Nov 18 07:16:49 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* missing/langinfo.c (strncasecmp): get rid of redefinition.
Index: common.mk
===================================================================
--- common.mk	(revision 29824)
+++ common.mk	(revision 29825)
@@ -150,6 +150,12 @@
 	"	SOLIBS = $(SOLIBS)" \
 	$(MESSAGE_END)
 
+.PHONY: showconfig
+showconfig:
+	@$(MESSAGE_BEGIN) \
+	"$(configure_args)" \
+	$(MESSAGE_END)
+
 exts: $(MKMAIN_CMD)
 
 $(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 29824)
+++ Makefile.in	(revision 29825)
@@ -145,6 +145,8 @@
 
 MESSAGE_BEGIN = @for line in
 MESSAGE_END = ; do echo "$$line"; done
+
+configure_args = @configure_args@
 #### End of variables
 
 all:
@@ -223,10 +225,15 @@
 uncommon.mk: $(srcdir)/common.mk
 		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
 
-config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in
+.PHONY: reconfig
+reconfig-args = $(srcdir)/configure $(configure_args)
+config.status-args = ./config.status --recheck
+reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
+reconfig-exec-1 = set -x; "$$@"
+
+reconfig config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
-	set $(SHELL) ./config.status --recheck; \
-	exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
+	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
 $(srcdir)/configure: $(srcdir)/configure.in
 	$(CHDIR) $(srcdir) && exec $(AUTOCONF)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/