From: David Reid <dreid@apache.org>
Date: Sat, 15 Jun 2002 21:48:53 +0000 (+0000)
Subject: Fix the build on BSDi machines. The bsd_makefile trick didn't completely
X-Git-Tag: 2.0.38~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07edff2f1ca950be5747d3fad0207ee84941515e;p=apache

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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95708 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 8c30ebe8ce..e598f46d14 100644
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -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 @@ SHLIB_SUFFIX = so
 #
 # 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 \
diff --git a/configure.in b/configure.in
index dbdc3942e8..5bfbdaffda 100644
--- a/configure.in
+++ b/configure.in
@@ -489,6 +489,8 @@ AC_SUBST(perlbin)
 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 @@ case $host in
         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