Second part of IIS/nginx merge into M2 trunk.

This commit is contained in:
gregwroblewski
2012-08-20 20:31:06 +00:00
parent f3e31c75a4
commit 2dbe4ab4f0
23 changed files with 4780 additions and 43 deletions

View File

@@ -163,6 +163,26 @@ if test "$build_apache2_module" -eq 1; then
fi
# Standalone Module
AC_ARG_ENABLE(standalone-module,
AS_HELP_STRING([--disable-standalone-module],
[Disable building standalone module.]),
[
if test "$enableval" != "no"; then
build_standalone_module=1
else
build_standalone_module=0
fi
],
[
build_standalone_module=1
])
AM_CONDITIONAL([BUILD_STANDALONE_MODULE], [test "$build_standalone_module" -eq 1])
if test "$build_standalone_module" -eq 1; then
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS standalone"
fi
# Extensions
AC_ARG_ENABLE(extentions,
AS_HELP_STRING([--enable-extentions],
@@ -662,6 +682,9 @@ fi
if test "$build_apache2_module" -ne 0; then
AC_CONFIG_FILES([apache2/Makefile])
fi
if test "$build_standalone_module" -ne 0; then
AC_CONFIG_FILES([standalone/Makefile])
fi
if test "$build_extentions" -ne 0; then
AC_CONFIG_FILES([ext/Makefile])
fi