Files
Rainer Jung 40581b9391 The GCC flag "-Wno-error=comment" introduced by r1855446
and r1850745 are only known since GCC 4.2. Since it gets
set unconditionally, this breaks compilation with old GCC
even when not using maintainer mode.

Make the fix for maintainer mode more specific by using
a version dependent pragma in the relevant two C files
only switching off error status for comment warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1864435 13f79535-47bb-0310-9956-ffa450edef68
2019-08-05 14:18:22 +00:00

217 lines
7.1 KiB
Plaintext

dnl modules enabled in this directory by default
dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
APACHE_MODPATH_INIT(filters)
APACHE_MODULE(buffer, Filter Buffering, , , most)
APACHE_MODULE(data, RFC2397 data encoder, , , )
APACHE_MODULE(ratelimit, Output Bandwidth Limiting, , , most)
APACHE_MODULE(reqtimeout, Limit time waiting for request from client, , , yes)
APACHE_MODULE(ext_filter, external filter module, , , most)
APACHE_MODULE(request, Request Body Filtering, , , most)
APACHE_MODULE(include, Server Side Includes, , , most)
APACHE_MODULE(filter, Smart Filtering, , , yes)
APACHE_MODULE(reflector, Reflect request through the output filter stack, , , )
APACHE_MODULE(substitute, response content rewrite-like filtering, , , most)
sed_obj="mod_sed.lo sed0.lo sed1.lo regexp.lo"
APACHE_MODULE(sed, filter request and/or response bodies through sed, $sed_obj, , most, [
if test "x$enable_sed" = "xshared"; then
# The only symbol which needs to be exported is the module
# structure, so ask libtool to hide libsed internals:
APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
fi
])
if test "$ac_cv_ebcdic" = "yes"; then
# mod_charset_lite can be very useful on an ebcdic system,
# so include it by default
APACHE_MODULE(charset_lite, character set translation. Enabled by default only on EBCDIC systems., , , yes)
else
APACHE_MODULE(charset_lite, character set translation. Enabled by default only on EBCDIC systems., , , )
fi
APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
AC_ARG_WITH(z, APACHE_HELP_STRING(--with-z=PATH,use a specific zlib library),
[
if test "x$withval" != "xyes" && test "x$withval" != "x"; then
ap_zlib_base="$withval"
ap_zlib_with="yes"
fi
])
if test "x$ap_zlib_base" = "x"; then
AC_MSG_CHECKING([for zlib location])
AC_CACHE_VAL(ap_cv_zlib,[
for dir in /usr/local /usr ; do
if test -d $dir && test -f $dir/include/zlib.h; then
ap_cv_zlib=$dir
break
fi
done
])
ap_zlib_base=$ap_cv_zlib
if test "x$ap_zlib_base" = "x"; then
enable_deflate=no
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([$ap_zlib_base])
fi
fi
if test "$enable_deflate" != "no"; then
ap_save_includes=$INCLUDES
ap_save_ldflags=$LDFLAGS
ap_save_cppflags=$CPPFLAGS
ap_zlib_ldflags=""
if test "$ap_zlib_base" != "/usr"; then
APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
APR_ADDTO(MOD_INCLUDES, [-I${ap_zlib_base}/include])
dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
CPPFLAGS="$CPPFLAGS $INCLUDES"
APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
APR_ADDTO(ap_zlib_ldflags, [-L${ap_zlib_base}/lib])
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
APR_ADDTO(ap_zlib_ldflags, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
fi
fi
APR_ADDTO(LIBS, [-lz])
AC_MSG_CHECKING([for zlib library])
AC_TRY_LINK([#include <zlib.h>], [int i = Z_OK;],
[AC_MSG_RESULT(found)
APR_ADDTO(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
[AC_MSG_RESULT(not found)
enable_deflate=no
if test "x$ap_zlib_with" = "x"; then
AC_MSG_WARN([... Error, zlib was missing or unusable])
else
AC_MSG_ERROR([... Error, zlib was missing or unusable])
fi
])
INCLUDES=$ap_save_includes
LDFLAGS=$ap_save_ldflags
CPPFLAGS=$ap_save_cppflags
APR_REMOVEFROM(LIBS, [-lz])
fi
])
AC_DEFUN([FIND_LIBXML2], [
AC_CACHE_CHECK([for libxml2], [ac_cv_libxml2], [
AC_ARG_WITH(libxml2,
[APACHE_HELP_STRING(--with-libxml2=PATH,location for libxml2)],
[test_paths="${with_libxml2}/include/libxml2 ${with_libxml2}/include ${with_libxml2}"],
[test_paths="/usr/include/libxml2 /usr/local/include/libxml2 /usr/include /usr/local/include"]
)
AC_MSG_CHECKING(for libxml2)
xml2_path=""
for x in ${test_paths}; do
if test -f "${x}/libxml/parser.h"; then
xml2_path="${x}"
break
fi
done
if test -n "${xml2_path}" ; then
ac_cv_libxml2=yes
XML2_INCLUDES="${xml2_path}"
else
ac_cv_libxml2=no
fi
])
])
APACHE_MODULE(xml2enc, i18n support for markup filters, , , , [
FIND_LIBXML2
if test "$ac_cv_libxml2" = "yes" ; then
APR_ADDTO(MOD_CFLAGS, [-I${XML2_INCLUDES}])
APR_ADDTO(MOD_XML2ENC_LDADD, [-lxml2])
else
enable_xml2enc=no
fi
])
APACHE_MODULE(proxy_html, Fix HTML Links in a Reverse Proxy, , , , [
FIND_LIBXML2
if test "$ac_cv_libxml2" = "yes" ; then
APR_ADDTO(MOD_CFLAGS, [-I${XML2_INCLUDES}])
APR_ADDTO(MOD_PROXY_HTML_LDADD, [-lxml2])
else
enable_proxy_html=no
fi
]
)
APACHE_MODULE(brotli, Brotli compression support, , , most, [
AC_ARG_WITH(brotli, APACHE_HELP_STRING(--with-brotli=PATH,Brotli installation directory),[
if test "$withval" != "yes" -a "x$withval" != "x"; then
ap_brotli_base="$withval"
ap_brotli_with=yes
fi
])
ap_brotli_found=no
if test -n "$ap_brotli_base"; then
ap_save_cppflags=$CPPFLAGS
APR_ADDTO(CPPFLAGS, [-I${ap_brotli_base}/include])
AC_MSG_CHECKING([for Brotli library >= 0.6.0 via prefix])
AC_TRY_COMPILE(
[#include <brotli/encode.h>],[
const uint8_t *o = BrotliEncoderTakeOutput((BrotliEncoderState*)0, (size_t*)0);
if (o) return *o;],
[AC_MSG_RESULT(yes)
ap_brotli_found=yes
ap_brotli_cflags="-I${ap_brotli_base}/include"
ap_brotli_libs="-L${ap_brotli_base}/lib -lbrotlienc -lbrotlicommon"],
[AC_MSG_RESULT(no)]
)
CPPFLAGS=$ap_save_cppflags
else
if test -n "$PKGCONFIG"; then
AC_MSG_CHECKING([for Brotli library >= 0.6.0 via pkg-config])
if $PKGCONFIG --exists "libbrotlienc >= 0.6.0"; then
AC_MSG_RESULT(yes)
ap_brotli_found=yes
ap_brotli_cflags=`$PKGCONFIG libbrotlienc --cflags`
ap_brotli_libs=`$PKGCONFIG libbrotlienc --libs`
else
AC_MSG_RESULT(no)
fi
fi
fi
if test "$ap_brotli_found" = "yes"; then
APR_ADDTO(MOD_CFLAGS, [$ap_brotli_cflags])
APR_ADDTO(MOD_BROTLI_LDADD, [$ap_brotli_libs])
if test "$enable_brotli" = "shared"; then
dnl The only symbol which needs to be exported is the module
dnl structure, so ask libtool to hide everything else:
APR_ADDTO(MOD_BROTLI_LDADD, [-export-symbols-regex brotli_module])
fi
else
enable_brotli=no
if test "$ap_brotli_with" = "yes"; then
AC_MSG_ERROR([Brotli library was missing or unusable])
fi
fi
])
APACHE_MODULE(crypto, Symmetrical encryption / decryption, , , no, [
dnl Check for the required APR-util version.
AC_MSG_CHECKING([for APR-util >= 1.6])
if test "$apr_major_version" -lt 2; then
case "$APU_VERSION" in
dnl Sorry for the quadrigraphs; this expands to "1.[0-5].*)"
1.@<:@0-5@:>@.*)
AC_MSG_RESULT(no)
enable_crypto=no
;;
*)
AC_MSG_RESULT(yes)
;;
esac
else
AC_MSG_RESULT([yes (APR 2)])
fi
])
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
APACHE_MODPATH_FINISH