summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-09-24 13:22:51 +0200
committerSimon Josefsson <simon@josefsson.org>2007-09-24 13:22:51 +0200
commita4a6d31d913d93f3c93b94be7ba7e5e981ecc79f (patch)
treecfa0af0155801fc38c1f865a77573b7bb06b5365
parent8c17f759104e26a1ddb6084b2798e2ad338843b5 (diff)
downloadgnutls-a4a6d31d913d93f3c93b94be7ba7e5e981ecc79f.tar.gz
Rework Camellia configure messages and logic.
-rw-r--r--configure.in20
1 files changed, 12 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index 657cd4300d..f8aa5b8b47 100644
--- a/configure.in
+++ b/configure.in
@@ -448,21 +448,25 @@ AM_CONDITIONAL(ENABLE_AUTHZ, test "$ac_enable_authz" != "no")
dnl Check for Camellia support
dnl
-AC_MSG_CHECKING([for Camellia support in libgcrypt])
AC_ARG_ENABLE(camellia,
AS_HELP_STRING([--disable-camellia], [disable Camellia cipher]),
ac_enable_camellia=no)
-if test "$ac_enable_authz" != "no" && \
- test -n "`$LIBGCRYPT_CONFIG --algorithms | grep -i camellia`"; then
- ac_enable_camellia=yes
-else
- ac_enable_camellia=no
+if test "$ac_enable_camellia" != "no"; then
+ AC_MSG_CHECKING([for Camellia support in libgcrypt])
+ if test -n "`$LIBGCRYPT_CONFIG --algorithms | grep -i camellia`"; then
+ AC_MSG_RESULT([yes])
+ ac_enable_camellia=yes
+ else
+ AC_MSG_RESULT([no])
+ ac_enable_camellia=no
+ fi
fi
+AC_MSG_CHECKING([whether to disable Camellia cipher])
if test "$ac_enable_camellia" = "yes"; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([no])
AC_DEFINE(ENABLE_CAMELLIA, 1, [enable camellia block cipher])
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([yes])
fi
AC_MSG_CHECKING([whether to disable extra PKI stuff])