You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2001/02/20 00:00:41 UTC
cvs commit: apr CHANGES configure.in
trawick 01/02/19 15:00:41
Modified: . CHANGES configure.in
Log:
Cope with BSDi installations where the default make has been
replaced with GNU make.
Submitted by: Joe Orton <jo...@manyfish.co.uk>
Reviewed by: Jeff Trawick
Revision Changes Path
1.64 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- CHANGES 2001/02/18 15:52:12 1.63
+++ CHANGES 2001/02/19 23:00:38 1.64
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Cope with BSDi installations where the default make has been
+ replaced with GNU make. [Joe Orton <jo...@manyfish.co.uk>]
+
*) Changed apr/helpers to apr/build to be consistent with other Apache
source trees. Added make variables to rules.mk.in that point to the
builders directory and its scripts. Updated buildconf, configure.in,
1.229 +7 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- configure.in 2001/02/18 15:52:12 1.228
+++ configure.in 2001/02/19 23:00:39 1.229
@@ -920,7 +920,13 @@
dnl
case "$host_alias" in
*bsdi*)
- INCLUDE_RULES=".include \"$apr_builders/rules.mk\""
+ # Check whether they've installed GNU make
+ if make --version > /dev/null 2>&1; then
+ INCLUDE_RULES="include $apr_builders/rules.mk"
+ else
+ # BSDi make
+ INCLUDE_RULES=".include \"$apr_builders/rules.mk\""
+ fi
;;
*)
INCLUDE_RULES="include $apr_builders/rules.mk"