Set BSD_MAKEFILE in configure.in. The macro APACHE_GEN_MAKEFILES is

executed in the context of config.status with variable substitution
already performed, so the check in the macro itself did not work.

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

diff --git a/acinclude.m4 b/acinclude.m4
index bbbf875e522967ee8b940f73788806c883332bfe..fcab8ed1b5464696fc14e9b391cc11fa11e24627 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -90,7 +90,6 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
 dnl APACHE_GEN_MAKEFILES
 dnl Creates Makefiles
 AC_DEFUN(APACHE_GEN_MAKEFILES,[
-  test -z "$BSD_MAKEFILE" && BSD_MAKEFILE=no
   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
 ])
 

diff --git a/configure.in b/configure.in
index 1c8f0fa64dc5bcf398012aa4dfbdf1838a4f13c0..45fbd017fed76e91520b07dd9a4541ec7cf67ba6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -244,6 +244,7 @@ AC_SUBST(perlbin)
 
 dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
 
+BSD_MAKEFILE=no
 case "$host_alias" in
 *bsdi*)
     BSD_MAKEFILE=yes;;