Changeset 1a6eeae in mod_gnutls for configure.ac


Ignore:
Timestamp:
Feb 1, 2020, 12:33:12 PM (17 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
asyncio, master, proxy-ticket
Children:
bfef00c
Parents:
2794787
Message:

Allow overriding the default HTTPD mutex via configure

The custom config file in the CI test environment can't be passed to
the distcheck environment, which broke builds with the previous
commit. This should be a clean solution.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r2794787 r1a6eeae  
    159159      [use_netns="yes"], [use_netns="no"])
    160160AM_CONDITIONAL([ENABLE_NETNS], [test "$use_netns" != "no"])
    161 # Adjust Apache configuration for tests accordingly: Use pthread mutex
    162 # and test specific PID files if using namespaces, defaults otherwise.
    163 AS_IF([test "$use_netns" = "yes"],
    164       [MUTEX_CONF="Mutex pthread default"; PID_AFFIX="-\${TEST_NAME}"],
    165       [MUTEX_CONF=""; PID_AFFIX=""])
    166 AC_SUBST(MUTEX_CONF)
    167 AC_SUBST(PID_AFFIX)
    168 AM_SUBST_NOTMAKE(MUTEX_CONF)
    169 AM_SUBST_NOTMAKE(PID_AFFIX)
    170161
    171162AC_ARG_ENABLE(msva,
     
    228219AC_SUBST(MODULE_LIBS)
    229220
     221# Adjust Apache configuration for tests: Use pthread mutex and test
     222# specific PID files if using namespaces. Otherwise defaults are used,
     223# and the user can override the default mutex type.
     224AC_ARG_VAR([APACHE_MUTEX], [Override the default mutex for the test \
     225                           environment. The value is used only when running \
     226                           without namespace isolation, tests running in \
     227                           their own namespaces always use "pthread".])
     228AS_IF([test -n "${APACHE_MUTEX}"],
     229      [MUTEX_CONF="Mutex ${APACHE_MUTEX} default"],
     230      [MUTEX_CONF=""])
     231AS_IF([test "$use_netns" = "yes"],
     232      [MUTEX_CONF="Mutex pthread default"; PID_AFFIX="-\${TEST_NAME}"],
     233      [PID_AFFIX=""])
     234AC_SUBST(MUTEX_CONF)
     235AC_SUBST(PID_AFFIX)
     236AM_SUBST_NOTMAKE(MUTEX_CONF)
     237AM_SUBST_NOTMAKE(PID_AFFIX)
     238
    230239# assign default values to TEST_HOST and TEST_IP if necessary
    231240: ${TEST_HOST:="localhost"}
Note: See TracChangeset for help on using the changeset viewer.