nobu	2008-08-14 12:01:42 +0900 (Thu, 14 Aug 2008)

  New Revision: 18600

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

  Log:
    * configure.in (gnumake): check for GNU make.
    
    * Makefile.in (uncommon.mk): includes filtered common.mk.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in
    trunk/cygwin/GNUmakefile.in
    trunk/djgpp/GNUmakefile.in

Index: configure.in
===================================================================
--- configure.in	(revision 18599)
+++ configure.in	(revision 18600)
@@ -1849,13 +1849,39 @@
 	esac
         MINIDLNOBJ=dmydln.o
 	;;
+    *msdosdjgpp*)
+	FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in
+	;;
     *)
 	;;
 esac
 MINIOBJS="$MINIDLNOBJ"
 
-case "$build_os" in
-  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
+case "$FIRSTMAKEFILE" in
+dnl (
+*GNUmakefile:*)
+    gnumake=yes
+    ;;
+dnl (
+*)
+    AC_MSG_CHECKING([for if ${MAKE-make} is GNU make])
+    mkdir conftest.dir
+    echo "all:; @echo yes" > conftest.dir/GNUmakefile
+    echo "all:; @echo no" > conftest.dir/Makefile
+    gnumake=`(cd conftest.dir; ${MAKE-make})`
+    rm -fr conftest.dir
+    case "$gnumake" in
+    dnl (
+    *yes*)
+	echo "include Makefile" > GNUmakefile
+	echo "include uncommon.mk" >> GNUmakefile
+	gnumake=yes;;
+    dnl (
+    *)
+	gnumake=no;;
+    esac
+    AC_MSG_RESULT($gnumake)
+    ;;
 esac
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
@@ -2069,7 +2095,10 @@
 	sed '/^MISSING/s/\$U\././g' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
-	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	if test "$gnumake" != yes; then
+	    echo ['$(MKFILES): $(srcdir)/common.mk']
+	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	fi
       } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake])
 AC_OUTPUT
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18599)
+++ ChangeLog	(revision 18600)
@@ -1,5 +1,9 @@
-Thu Aug 14 11:45:09 2008  Nobuyoshi Nakada  <nobu@r...>
+Thu Aug 14 12:01:39 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in (gnumake): check for GNU make.
+
+	* Makefile.in (uncommon.mk): includes filtered common.mk.
+
 	* common.mk (parse.h): workaround for nmake.
 
 Thu Aug 14 06:09:12 2008  Koichi Sasada  <ko1@a...>
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 18599)
+++ cygwin/GNUmakefile.in	(revision 18600)
@@ -1,4 +1,5 @@
 include Makefile
+include uncommon.mk
 
 ENABLE_SHARED=@ENABLE_SHARED@
 DLLWRAP = @DLLWRAP@ --target=@target_os@
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 18599)
+++ Makefile.in	(revision 18600)
@@ -158,7 +158,7 @@
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/common.mk
+$(MKFILES): config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
 		@{ \
 		    echo "all:; -@rm -f conftest.mk"; \
@@ -168,6 +168,9 @@
 		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
 		{ echo "Makefile updated, restart."; exit 1; }
 
+uncommon.mk: $(srcdir)/common.mk
+		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
+
 config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in
 		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
 
Index: djgpp/GNUmakefile.in
===================================================================
--- djgpp/GNUmakefile.in	(revision 18599)
+++ djgpp/GNUmakefile.in	(revision 18600)
@@ -1,2 +1,3 @@
 include Makefile
 VPATH = $(srcdir) $(srcdir)/missing
+include uncommon.mk

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