jwoolley 01/11/06 18:57:21
Modified: . CHANGES configure.in
Log:
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.)
Revision Changes Path
1.36 +2 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -u -r1.35 -r1.36
--- CHANGES 2001/11/06 02:17:56 1.35
+++ CHANGES 2001/11/07 02:57:21 1.36
@@ -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]
1.36 +7 -2 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -u -r1.35 -r1.36
--- configure.in 2001/09/14 02:41:04 1.35
+++ configure.in 2001/11/07 02:57:21 1.36
@@ -89,8 +89,13 @@
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"
