Changeset fe3564a in mod_gnutls for configure.ac

Timestamp:

Jan 28, 2020, 4:50:37 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, 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:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -176 +176 @@
 
 MSVA_CFLAGS=""
-if test "$use_msva" != "no"; then
+AS_IF([test "$use_msva" != "no"], [
         AC_CHECK_HEADERS([msv/msv.h], [],
-                         [AC_MSG_ERROR([*** No libmsv headers found!])])
-        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
-                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
+                         [AC_MSG_ERROR([*** No libmsv headers found!])])
+        AC_SEARCH_LIBS([msv_query_agent], [msv], [],
+                         [AC_MSG_ERROR([*** No libmsv found with msv_query_agent!])])
         MSVA_CFLAGS="-DENABLE_MSVA=1"
-fi
+])
 
 AC_MSG_CHECKING([whether to enable MSVA functionality])
@@ -191 +191 @@
 build_doc=no
 AC_PATH_PROG([PANDOC], [pandoc], [no])
-if test "$PANDOC" != "no"; then
+AS_IF([test "$PANDOC" != "no"], [
         AC_PATH_PROG([PDFLATEX], [pdflatex], [no])
         if test "$PDFLATEX" != "no"; then
@@ -198 +198 @@
                 build_doc="html, manual page"
         fi
-else
+], [
         AC_PATH_PROG([MARKDOWN], [markdown], [no])
         if test "$MARKDOWN" != "no"; then
                 build_doc="html stub"
         fi
-fi
+])
 AM_CONDITIONAL([USE_PANDOC], [test "$PANDOC" != "no"])
 AM_CONDITIONAL([USE_PDFLATEX], [test "$PANDOC" != "no" && \
@@ -212 +212 @@
 # Check for Apache binary
 AC_PATH_PROGS([APACHE2], [apache2 httpd], [no], [$PATH:/usr/sbin])
-if test "${APACHE2}" = "no"; then
+AS_IF([test "${APACHE2}" = "no"], [
         AC_MSG_WARN([Neither apache2 nor httpd found in \
                      PATH. Test suite will fail.])
-fi
+])
 
 AC_PATH_PROGS([HTTP_CLI], [curl], [no])