Tolerate dependency checking failures in configure (25cfc680) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

CHANGES

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,9 @@ Changes with Apache 2.3.14
	*) configure: Only link the httpd binary against PCRE. No other support		*) configure: Only link the httpd binary against PCRE. No other support
	binary needs PCRE. [Rainer Jung]		binary needs PCRE. [Rainer Jung]

			*) configure: tolerate dependency checking failures for modules if
			they have been enabled implicitely. [Rainer Jung]

	Changes with Apache 2.3.13		Changes with Apache 2.3.13

	*) ab: Support specifying the local address to use. PR 48930.		*) ab: Support specifying the local address to use. PR 48930.

acinclude.m4

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -282,7 +282,7 @@ AC_DEFUN(APACHE_MODULE,[
	AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))		AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
	undefine([optname])dnl		undefine([optname])dnl
	_apmod_extra_msg=""		_apmod_extra_msg=""
	dnl When --enable-modules=most or --enable-modules=reallyall is set and the		dnl When --enable-modules=most or --enable-modules=(really)all is set and the
	dnl module was not explicitly requested, allow a module to disable itself if		dnl module was not explicitly requested, allow a module to disable itself if
	dnl its pre-reqs fail.		dnl its pre-reqs fail.
	dnl XXX: Todo: Allow to disable specific modules even with "reallyall".		dnl XXX: Todo: Allow to disable specific modules even with "reallyall".

modules/cache/config.m4

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ if test "x$ap_distcache_configured" = "x"; then
	ap_distcache_base=""		ap_distcache_base=""
	ap_distcache_libs=""		ap_distcache_libs=""
	ap_distcache_ldflags=""		ap_distcache_ldflags=""
			ap_distcache_with=""

	dnl Determine the distcache base directory, if any		dnl Determine the distcache base directory, if any
	AC_MSG_CHECKING([for user-provided distcache base])		AC_MSG_CHECKING([for user-provided distcache base])
	@@ -45,6 +46,7 @@ if test "x$ap_distcache_configured" = "x"; then
	dnl If --with-distcache specifies a directory, we use that directory or fail		dnl If --with-distcache specifies a directory, we use that directory or fail
	if test "x$withval" != "xyes" -a "x$withval" != "x"; then		if test "x$withval" != "xyes" -a "x$withval" != "x"; then
	dnl This ensures $withval is actually a directory and that it is absolute		dnl This ensures $withval is actually a directory and that it is absolute
			ap_distcache_with="yes"
	ap_distcache_base="`cd $withval ; pwd`"		ap_distcache_base="`cd $withval ; pwd`"
	fi		fi
	])		])
	@@ -83,7 +85,11 @@ if test "x$ap_distcache_configured" = "x"; then
	AC_MSG_RESULT($ap_distcache_found)		AC_MSG_RESULT($ap_distcache_found)
	fi		fi
	if test "$ap_distcache_found" != "yes"; then		if test "$ap_distcache_found" != "yes"; then
			if test "x$ap_distcache_with" = "x"; then
			AC_MSG_WARN([...No distcache detected])
			else
	AC_MSG_ERROR([...No distcache detected])		AC_MSG_ERROR([...No distcache detected])
			fi
	else		else
	dnl Run library and function checks		dnl Run library and function checks
	AC_MSG_CHECKING(for distcache libraries)		AC_MSG_CHECKING(for distcache libraries)
	@@ -97,9 +103,13 @@ if test "x$ap_distcache_configured" = "x"; then
	[ap_distcache_found="no"])		[ap_distcache_found="no"])
	AC_MSG_RESULT($ap_distcache_found)		AC_MSG_RESULT($ap_distcache_found)
	if test "$ap_distcache_found" != "yes"; then		if test "$ap_distcache_found" != "yes"; then
			if test "x$ap_distcache_base" = "x"; then
			AC_MSG_WARN([... Error, distcache libraries were missing or unusable])
			else
	AC_MSG_ERROR([... Error, distcache libraries were missing or unusable])		AC_MSG_ERROR([... Error, distcache libraries were missing or unusable])
	fi		fi
	fi		fi
			fi

	dnl restore		dnl restore
	CPPFLAGS="$saved_CPPFLAGS"		CPPFLAGS="$saved_CPPFLAGS"

modules/filters/config.m4

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
	[		[
	if test "x$withval" != "xyes" && test "x$withval" != "x"; then		if test "x$withval" != "xyes" && test "x$withval" != "x"; then
	ap_zlib_base="$withval"		ap_zlib_base="$withval"
			ap_zlib_with="yes"
	fi		fi
	])		])
	if test "x$ap_zlib_base" = "x"; then		if test "x$ap_zlib_base" = "x"; then
	@@ -75,7 +76,13 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
	APR_SETVAR(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],		APR_SETVAR(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
	[AC_MSG_RESULT(not found)		[AC_MSG_RESULT(not found)
	enable_deflate=no		enable_deflate=no
	INCLUDES=$ap_save_includes])		INCLUDES=$ap_save_includes
			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
			])
	LDFLAGS=$ap_save_ldflags		LDFLAGS=$ap_save_ldflags
	CPPFLAGS=$ap_save_cppflags		CPPFLAGS=$ap_save_cppflags
	APR_REMOVEFROM(LIBS, [-lz])		APR_REMOVEFROM(LIBS, [-lz])

modules/lua/config.m4

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,8 +115,15 @@ AC_SUBST(LUA_LIBS)
	AC_SUBST(LUA_CFLAGS)		AC_SUBST(LUA_CFLAGS)

	if test -z "${LUA_LIBS}"; then		if test -z "${LUA_LIBS}"; then
	AC_MSG_NOTICE([*** Lua 5.1 library not found.])		AC_MSG_WARN([*** Lua 5.1 library not found.])
	ifelse([$2], , AC_MSG_ERROR([Lua 5.1 library is required]), $2)		ifelse([$2], ,
			enable_lua="no"
			if test -z "${lua_path}"; then
			AC_MSG_WARN([Lua 5.1 library is required])
			else
			AC_MSG_ERROR([Lua 5.1 library is required])
			fi,
			$2)
	else		else
	AC_MSG_NOTICE([using '${LUA_LIBS}' for Lua Library])		AC_MSG_NOTICE([using '${LUA_LIBS}' for Lua Library])
	AC_ARG_ENABLE(luajit,		AC_ARG_ENABLE(luajit,

Admin message