VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-16 16:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jim Jagielski
2013-12-20 18:48:14 +00:00
parent d7dd87bf21
commit d6e91afa0c
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/fastgen.sh
View File

@ -52,7 +52,11 @@ if test "$bsd_makefile" = "yes"; then
real_srcdir=$top_srcdir/$dir real_srcdir=$top_srcdir/$dir
real_builddir=$top_builddir/$dir real_builddir=$top_builddir/$dir
fi 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_srcdir = $top_srcdir
top_builddir = $top_builddir top_builddir = $top_builddir
srcdir = $real_srcdir srcdir = $real_srcdir

4
build/ltlib.mk
View File

@ -18,6 +18,6 @@
TARGETS = $(LTLIBRARY_NAME) TARGETS = $(LTLIBRARY_NAME)
include $(top_builddir)/build/rules.mk .include "$(top_builddir)/build/rules.mk"
include $(top_srcdir)/build/library.mk .include "$(top_srcdir)/build/library.mk"

4
build/special.mk
View File

@ -18,13 +18,13 @@
all: all-recursive all: all-recursive
include $(builddir)/modules.mk .include "$(builddir)/modules.mk"
TARGETS = $(static) TARGETS = $(static)
SHARED_TARGETS = $(shared) SHARED_TARGETS = $(shared)
INSTALL_TARGETS = install-modules-$(INSTALL_DSO) INSTALL_TARGETS = install-modules-$(INSTALL_DSO)
include $(top_builddir)/build/rules.mk .include "$(top_builddir)/build/rules.mk"
install-modules-yes: $(SHARED_TARGETS) install-modules-yes: $(SHARED_TARGETS)
@if test -n "$(shared)"; then \ @if test -n "$(shared)"; then \

15
configure.in
View File

@ -909,24 +909,35 @@ if test "x$perlbin" = "x"; then
fi fi
AC_SUBST(perlbin) 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 BSD_MAKEFILE=no
ap_make_include=include ap_make_include=include
ap_make_ifdef=ifdef
ap_make_else=else
ap_make_endif=endif
ap_make_delimiter=' ' ap_make_delimiter=' '
case $host in case $host in
*bsdi*) *bsd*)
# Check whether they've installed GNU make # Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then if make --version > /dev/null 2>&1; then
true true
else else
BSD_MAKEFILE=yes BSD_MAKEFILE=yes
ap_make_include=.include ap_make_include=.include
ap_make_ifdef=.ifdef
ap_make_else=.else
ap_make_endif=.endif
ap_make_delimiter='"' ap_make_delimiter='"'
fi fi
;; ;;
esac esac
AC_MSG_NOTICE([using BSD Makefile syntax... $BSD_MAKEFILE])
AC_SUBST(ap_make_include) 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) AC_SUBST(ap_make_delimiter)
dnl Ensure that docs/conf is created. dnl Ensure that docs/conf is created.