svn commit: r1894167 - in /apr/apr/trunk: CHANGES build/apr_network.m4

[jo...@apache.org]

Author: jorton
Date: Tue Oct 12 16:15:04 2021
New Revision: 1894167

URL: http://svn.apache.org/viewvc?rev=1894167&view=rev
Log:
Since runtime SCTP detection is dependent on kernel configuration, add
flags to make SCTP support reliable:

* build/apr_network.m4 (APR_CHECK_SCTP): Add --disable-sctp flag to
  forcibly disable SCTP support, and --enable-sctp to fail configure
  if is SCTP support is requested but not available.

Submitted by: Lubos Uhliarik <luhliari redhat.com>, jorton
Github: closes #28

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/apr_network.m4

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1894167&r1=1894166&r2=1894167&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Tue Oct 12 16:15:04 2021
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) 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]
+  
   *) apr_dbm: Add dedicated apr_dbm_get_driver() function that returns
      details of the driver selected and any error encountered. Add the
      apr_dbm_open2() function that references the driver. [Graham Leggett]

Modified: apr/apr/trunk/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_network.m4?rev=1894167&r1=1894166&r2=1894167&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_network.m4 (original)
+++ apr/apr/trunk/build/apr_network.m4 Tue Oct 12 16:15:04 2021
@@ -906,8 +906,16 @@ dnl check for presence of SCTP protocol
 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