diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-09-24 12:45:33 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-09-24 12:45:33 +0200 |
| commit | 80e03f917e9180a93bc3f84d9a2ffa86fda3ee41 (patch) | |
| tree | 9dd34a8e98fce98f9b30a123de501830f42ceedf | |
| parent | de7cc29e8e6039b104d5bebe80e0f84f4d46fe17 (diff) | |
| download | gnutls-80e03f917e9180a93bc3f84d9a2ffa86fda3ee41.tar.gz | |
Add --disable-camellia. Remove automake conditional, not used.
| -rw-r--r-- | configure.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.in b/configure.in index e38d7197a4..f362804874 100644 --- 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, |