From: Jeff Trawick <trawick@apache.org>
Date: Fri, 23 Feb 2001 11:39:37 +0000 (+0000)
Subject: Work on a BSD/OS system where GNU make is used instead of the native
X-Git-Tag: 2.0.12~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b17e4118b77b08af07bb14663270803182c80de3;p=thirdparty%2Fapache%2Fhttpd.git

Work on a BSD/OS system where GNU make is used instead of the native
make.

Roy suggests using the variable set by AC_PROG_MAKE; we don't use that
yet, though I guess we could.  Greg suggests leaving this to Roy since
he will revamp this stuff soon anyway.

Inspired by: Joe Orton's patch to APR to accomplish the same thing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88286 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/configure.in b/configure.in
index 1c914b647ac..03c8b51c94e 100644
--- a/configure.in
+++ b/configure.in
@@ -282,7 +282,13 @@ dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
 BSD_MAKEFILE=no
 case "$host_alias" in
 *bsdi*)
-    BSD_MAKEFILE=yes;;
+    # Check whether they've installed GNU make
+    if make --version > /dev/null 2>&1; then
+        true
+    else
+        BSD_MAKEFILE=yes
+    fi
+    ;;
 esac
 
 AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl,,[