diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | build/apr_network.m4 | 17 |
2 files changed, 19 insertions, 2 deletions
@@ -6,6 +6,10 @@ Changes for APR 1.7.1 (This issue was addressed as CVE-2017-12613 in APR 1.6.3 and later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling] + *) configure: Add --disable-sctp argument to forcibly disable SCTP + support, or --enable-sctp which fails if SCTP support is not + detected. [Lubos Uhliarik <luhliari redhat.com>, Joe Orton] + *) Fix handle leak in the Win32 apr_uid_current implementation. PR 61165. [Ivan Zhakov] diff --git a/build/apr_network.m4 b/build/apr_network.m4 index 6918efcc3..21e9ce7e6 100644 --- a/build/apr_network.m4 +++ b/build/apr_network.m4 @@ -906,8 +906,16 @@ dnl check for presence of SCTP protocol support dnl AC_DEFUN([APR_CHECK_SCTP], [ - AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [ - AC_TRY_RUN([ +AC_ARG_ENABLE([sctp], + APR_HELP_STRING([--disable-sctp], [disable SCTP protocol support]), + [apr_wants_sctp=$enableval], + [apr_wants_sctp=any]) + +if test "$apr_wants_sctp" = no; then + apr_cv_sctp=no +else + AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [ + AC_TRY_RUN([ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -932,6 +940,11 @@ int main(void) { exit(2); exit(0); }], [apr_cv_sctp=yes], [apr_cv_sctp=no], [apr_cv_sctp=no])]) +fi + +if test "${apr_wants_sctp}X${apr_cv_sctp}" = yesXno; then + AC_MSG_ERROR([SCTP support requested but not available]) +fi if test "$apr_cv_sctp" = "yes"; then have_sctp=1 |