Changeset b27cce7 in mod_gnutls for configure.ac

Timestamp:

May 16, 2015, 2:43:23 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

c5d5942

Parents:

f71e6ce

git-author:

Thomas Klute <thomas2.klute@…> (05/16/15 14:40:33)

git-committer:

Thomas Klute <thomas2.klute@…> (05/16/15 14:43:23)

Message:

Fix MSVA conditional

Disabling the MSVA test if the user disabled MSVA didn't always work
correctly. Fix this by checking that "$use_msva" != "no" for enabling.

The commit also includes a few whitespace fixes.

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -42 +42 @@
 SRP_CFLAGS=""
 if test "$use_srp" != "no"; then
-        SRP_CFLAGS="-DENABLE_SRP=1"
+        SRP_CFLAGS="-DENABLE_SRP=1"
 fi
 
@@ -62 +62 @@
                [enable Monkeysphere client certificate verification]),
        use_msva=$enableval, use_msva=no)
-AM_CONDITIONAL([USE_MSVA], [test "$use_msva" = "$enableval"])
+AM_CONDITIONAL([USE_MSVA], [test "$use_msva" != "no"])
 
 MSVA_CFLAGS=""
 if test "$use_msva" != "no"; then
-        AC_CHECK_HEADERS([msv/msv.h], [], 
+        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!])])
-        MSVA_CFLAGS="-DENABLE_MSVA=1"
+        MSVA_CFLAGS="-DENABLE_MSVA=1"
 fi