For *bsd* systems, see if we are using BSD make and,

if so, then use that format for include/ifdef/else/endif

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

diff --git a/build/fastgen.sh b/build/fastgen.sh
index 87bce15e9fcca4f736ee04cddd1e732b85cb973c..7b089577276035a5912a1732b44ae18f038c130b 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -52,7 +52,11 @@ if test "$bsd_makefile" = "yes"; then
         real_srcdir=$top_srcdir/$dir
         real_builddir=$top_builddir/$dir
     fi
-    cat - $top_srcdir/$makefile.in <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile 
+    cat - $top_srcdir/$makefile.in <<EOF      | \
+       sed 's/^include \(.*\)/.include "\1"/' | \
+       sed 's/^ifdef \(.*\)/.ifdef \1/'       | \
+       sed 's/^else\(.*\)/.else\1/'           | \
+       sed 's/^endif\(.*\)/.endif\1/' >$makefile 
 top_srcdir   = $top_srcdir
 top_builddir = $top_builddir
 srcdir       = $real_srcdir

diff --git a/build/ltlib.mk b/build/ltlib.mk
index 3b87dd366c7357645e4ed57edf36983edc7e6884..84743a8687e0221c112def3a52618d71da6b0085 100644 (file)
--- a/build/ltlib.mk
+++ b/build/ltlib.mk
@@ -18,6 +18,6 @@
 
 TARGETS = $(LTLIBRARY_NAME)
 
-include $(top_builddir)/build/rules.mk
-include $(top_srcdir)/build/library.mk
+.include "$(top_builddir)/build/rules.mk"
+.include "$(top_srcdir)/build/library.mk"
 

diff --git a/build/special.mk b/build/special.mk
index 53b880dd569ef6e6062fdc3b152661acafdb5cbb..df47492ecdf08d189b1e32ce20a0cb7c4a72f2b3 100644 (file)
--- a/build/special.mk
+++ b/build/special.mk
@@ -18,13 +18,13 @@
 
 all: all-recursive
 
-include $(builddir)/modules.mk
+.include "$(builddir)/modules.mk"
 
 TARGETS = $(static)
 SHARED_TARGETS = $(shared)
 INSTALL_TARGETS = install-modules-$(INSTALL_DSO)
 
-include $(top_builddir)/build/rules.mk
+.include "$(top_builddir)/build/rules.mk"
 
 install-modules-yes: $(SHARED_TARGETS)
        @if test -n "$(shared)"; then \

diff --git a/configure.in b/configure.in
index 5f469a31e5849503c9a6ec789c6fdf4c3688569e..074cfd14b44e668ac8d621ad2444078c957666b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -909,24 +909,35 @@ if test "x$perlbin" = "x"; then
 fi
 AC_SUBST(perlbin)
 
-dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
+dnl If we are running on a BSD variant, see if we need to use the BSD .include syntax.
 
 BSD_MAKEFILE=no
 ap_make_include=include
+ap_make_ifdef=ifdef
+ap_make_else=else
+ap_make_endif=endif
 ap_make_delimiter=' '
 case $host in
-*bsdi*)
+*bsd*)
     # Check whether they've installed GNU make
     if make --version > /dev/null 2>&1; then
         true
     else
         BSD_MAKEFILE=yes
         ap_make_include=.include
+        ap_make_ifdef=.ifdef
+        ap_make_else=.else
+        ap_make_endif=.endif
         ap_make_delimiter='"'
     fi
     ;;
 esac
+AC_MSG_NOTICE([using BSD Makefile syntax... $BSD_MAKEFILE])
+
 AC_SUBST(ap_make_include)
+AC_SUBST(ap_make_ifdef)
+AC_SUBST(ap_make_else)
+AC_SUBST(ap_make_endif)
 AC_SUBST(ap_make_delimiter)
 
 dnl Ensure that docs/conf is created.