From a91845f5b3ec726e08501cc6597c1788b223cd41 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Aug 2008 03:01:42 +0000
Subject: * configure.in (gnumake): check for GNU make.

* Makefile.in (uncommon.mk): includes filtered common.mk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 1ad99ca5e5..a6b11f71df 100644
--- a/configure.in
+++ b/configure.in
@@ -1849,13 +1849,39 @@ case "$target_os" in
 	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 @@ AC_CONFIG_FILES(Makefile, [{
 	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
-- 
cgit v1.2.3