Add --disable-camellia. Remove automake conditional, not used.

diff --git a/configure.in b/configure.in
index e38d7197a415ab7e6ff2a36270dd3e8679886c03..f36280487420ef7a3b68d542826aa275ff221d0a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -449,17 +449,21 @@ AM_CONDITIONAL(ENABLE_AUTHZ, test "$ac_enable_authz" != "no")
 dnl Check for Camellia support
 dnl
 AC_MSG_CHECKING([for Camellia support in libgcrypt])
-if test -n "`$LIBGCRYPT_CONFIG --algorithms|grep -i camellia`"; then
- is_camellia_present=yes
+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
 fi
-if test x$is_camellia_present = xyes; then
+if test "$ac_enable_camellia = "yes"; then
  AC_MSG_RESULT([yes])
  AC_DEFINE(ENABLE_CAMELLIA, 1, [enable camellia block cipher])
 else
  AC_MSG_RESULT([no])
 fi
-AM_CONDITIONAL(ENABLE_CAMELLIA, test "$is_camellia_present" = "yes")
-
 
 AC_MSG_CHECKING([whether to disable extra PKI stuff])
 AC_ARG_ENABLE(extra-pki,