We weren't correctly detecting BSD/OS systems for Makefile conversion

because we were looking for "*bsdi*" in $host_alias; the problem is that
APR-util's $host_alias is not a "real" $host_alias like the one in
APR's configure script, but a dummied-up one generated from `uname -s`,
which on BSD/OS returns "BSD/OS".  So we weren't getting into that case and
we were generating SYSV-style Makefiles even on BSD/OS.  (I left the *bsdi*
part in just for good measure, and also added an extra check for GNU make
which I stole from APR.)


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58444 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index a734e850..e248eff9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with APR-util b1  
 
+  *) Fix Makefile conversion for BSD/OS.  [Cliff Woolley]
+
   *) Use APR_XtOffsetOf instead of offsetof() in the ring macros for
      portability.  [Cliff Woolley]
 
diff --git a/configure.in b/configure.in
index 67e4524b..5ea3ee8f 100644
--- a/configure.in
+++ b/configure.in
@@ -89,8 +89,13 @@ dnl
 dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
 dnl
 case "$host_alias" in
-*bsdi*)
-    INCLUDE_RULES=".include \"$top_builddir/../apr/build/rules.mk\""
+*bsdi* | BSD/OS)
+    # Check whether they've installed GNU make
+    if make --version > /dev/null 2>&1; then
+        INCLUDE_RULES="include $top_builddir/../apr/build/rules.mk"
+    else
+        INCLUDE_RULES=".include \"$top_builddir/../apr/build/rules.mk\""
+    fi
     ;;
 *)
     INCLUDE_RULES="include $top_builddir/../apr/build/rules.mk"