Changeset fe3564a in mod_gnutls


Ignore:
Timestamp:
Jan 28, 2020, 4:50:37 PM (6 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
master, proxy-ticket
Children:
7c89e8a
Parents:
d1d1e3a
Message:

configure.as: Use AS_IF instead of shell if-blocks around macros

Some macros can have weird side effects inside shell if-blocks. I
haven't seen problems with the ones here, but it's still better to
clean up.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rd1d1e3a rfe3564a  
    176176
    177177MSVA_CFLAGS=""
    178 if test "$use_msva" != "no"; then
     178AS_IF([test "$use_msva" != "no"], [
    179179        AC_CHECK_HEADERS([msv/msv.h], [],
    180                          [AC_MSG_ERROR([*** No libmsv headers found!])])
    181         AC_SEARCH_LIBS([msv_query_agent], [msv], [],
    182                          [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
     180                         [AC_MSG_ERROR([*** No libmsv headers found!])])
     181        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
     182                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
    183183        MSVA_CFLAGS="-DENABLE_MSVA=1"
    184 fi
     184])
    185185
    186186AC_MSG_CHECKING([whether to enable MSVA functionality])
     
    191191build_doc=no
    192192AC_PATH_PROG([PANDOC], [pandoc], [no])
    193 if test "$PANDOC" != "no"; then
     193AS_IF([test "$PANDOC" != "no"], [
    194194        AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
    195195        if test "$PDFLATEX" != "no"; then
     
    198198                build_doc="html, manual page"
    199199        fi
    200 else
     200], [
    201201        AC_PATH_PROG([MARKDOWN], [markdown], [no])
    202202        if test "$MARKDOWN" != "no"; then
    203203                build_doc="html stub"
    204204        fi
    205 fi
     205])
    206206AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
    207207AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
     
    212212# Check for Apache binary
    213213AC_PATH_PROGS([APACHE2], [apache2 httpd], [no], [$PATH:/usr/sbin])
    214 if test "${APACHE2}" = "no"; then
     214AS_IF([test "${APACHE2}" = "no"], [
    215215        AC_MSG_WARN([Neither apache2 nor httpd found in \
    216216                     PATH. Test suite will fail.])
    217 fi
     217])
    218218
    219219AC_PATH_PROGS([HTTP_CLI], [curl], [no])
Note: See TracChangeset for help on using the changeset viewer.