svn commit: r1552779 - in /httpd/httpd/trunk: build/fastgen.sh build/ltlib.mk build/special.mk configure.in

[ji...@apache.org]

Author: jim
Date: Fri Dec 20 18:48:14 2013
New Revision: 1552779

URL: http://svn.apache.org/r1552779
Log:
For *bsd* systems, see if we are using BSD make and,
if so, then use that format for include/ifdef/else/endif

Modified:
    httpd/httpd/trunk/build/fastgen.sh
    httpd/httpd/trunk/build/ltlib.mk
    httpd/httpd/trunk/build/special.mk
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/build/fastgen.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/fastgen.sh?rev=1552779&r1=1552778&r2=1552779&view=diff
==============================================================================
--- httpd/httpd/trunk/build/fastgen.sh (original)
+++ httpd/httpd/trunk/build/fastgen.sh Fri Dec 20 18:48:14 2013
@@ -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

Modified: httpd/httpd/trunk/build/ltlib.mk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/ltlib.mk?rev=1552779&r1=1552778&r2=1552779&view=diff
==============================================================================
--- httpd/httpd/trunk/build/ltlib.mk (original)
+++ httpd/httpd/trunk/build/ltlib.mk Fri Dec 20 18:48:14 2013
@@ -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"
 

Modified: httpd/httpd/trunk/build/special.mk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/special.mk?rev=1552779&r1=1552778&r2=1552779&view=diff
==============================================================================
--- httpd/httpd/trunk/build/special.mk (original)
+++ httpd/httpd/trunk/build/special.mk Fri Dec 20 18:48:14 2013
@@ -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 \

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1552779&r1=1552778&r2=1552779&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Fri Dec 20 18:48:14 2013
@@ -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.