summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2001-02-23 12:39:37 +0100
committerJeff Trawick <trawick@apache.org>2001-02-23 12:39:37 +0100
commitb17e4118b77b08af07bb14663270803182c80de3 (patch)
tree2510eee5263d55a0a5342041ec58614408a3c117
parentClean up a bunch of incompatible pointer type warnings. (diff)
downloadapache2-b17e4118b77b08af07bb14663270803182c80de3.tar.xz
apache2-b17e4118b77b08af07bb14663270803182c80de3.zip
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
-rw-r--r--configure.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 1c914b647a..03c8b51c94 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,,[