You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@apache.org on 2002/06/15 23:48:53 UTC
cvs commit: httpd-2.0/build rules.mk.in
dreid 2002/06/15 14:48:53
Modified: . configure.in
build rules.mk.in
Log:
Fix the build on BSDi machines. The bsd_makefile trick didn't completely
work as autoconf may run config.status and remove the fixes we've just
applied, so this allows us to workaround that problem.
Initailly suggested by Cliff, this is a modified version.
Revision Changes Path
1.225 +6 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- configure.in 14 Jun 2002 17:49:28 -0000 1.224
+++ configure.in 15 Jun 2002 21:48:53 -0000 1.225
@@ -489,6 +489,8 @@
dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
BSD_MAKEFILE=no
+ap_make_include=include
+ap_make_delimiter=' '
case $host in
*bsdi*)
# Check whether they've installed GNU make
@@ -496,9 +498,13 @@
true
else
BSD_MAKEFILE=yes
+ ap_make_include=.include
+ ap_make_delimiter='"'
fi
;;
esac
+AC_SUBST(ap_make_include)
+AC_SUBST(ap_make_delimiter)
dnl Ensure that docs/conf is created.
test -d docs/conf||$mkdir_p docs/conf
1.10 +2 -2 httpd-2.0/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rules.mk.in 15 Jun 2002 04:41:52 -0000 1.9
+++ rules.mk.in 15 Jun 2002 21:48:53 -0000 1.10
@@ -54,7 +54,7 @@
# The build environment was originally provided by Sascha Schumann.
#
-include $(top_builddir)/build/config_vars.mk
+@ap_make_include@ @ap_make_delimiter@$(top_builddir)/build/config_vars.mk@ap_make_delimiter@
# Combine all of the flags together in the proper order so that
# the user-defined flags can always override the configure ones, if needed.
@@ -252,7 +252,7 @@
#
# Dependencies
#
-include $(builddir)/.deps
+@ap_make_include@ @ap_make_delimiter@$(builddir)/.deps@ap_make_delimiter@
.PHONY: all all-recursive install-recursive local-all $(PHONY_TARGETS) \
shared-build shared-build-recursive local-shared-build \