summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-05-13 08:27:37 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-05-13 08:27:37 +0000
commit0a8b936bd02cd6b04f87c9a179532ac8d22655ff (patch)
tree678b7febcb54ab2f80648a05d9a1bd4e48189412 /configure.in
parent962b647a10e13a2098d81faaccca9e4363477c64 (diff)
downloadgnutls-0a8b936bd02cd6b04f87c9a179532ac8d22655ff.tar.gz
some fixes in the compilation system.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in18
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index ae9bf4f9b0..fbddb6969d 100644
--- a/configure.in
+++ b/configure.in
@@ -302,22 +302,27 @@ else
fi
+dnl Check whether to disable OpenPGP authentication completely
+dnl from libgnutls-extra.
+
ac_enable_openpgp=yes
AC_MSG_CHECKING([whether to disable OpenPGP Certificate authentication support])
AC_ARG_ENABLE( openpgp-authentication, [ --disable-openpgp-authentication Disable the OpenPGP authentication support],
ac_enable_openpgp=no
)
-if test x$ac_enable_openpgp != xno; then
- AC_MSG_RESULT(no)
-else
- AC_DEFINE(HAVE_LIBOPENCDK, 1, [have libopencdk])
+if test x$ac_enable_openpgp = xno; then
AC_MSG_RESULT(yes)
+else
+ AC_DEFINE(USE_OPENPGP, 1, [use openpgp authentication])
+ AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
-if test x$ac_enable_openpgp != xno; then
+dnl Test whether to use the included opencdk library
+dnl
+if test x$ac_enable_openpgp = xyes; then
AC_ARG_WITH(included-opencdk,
[ --with-included-opencdk Use the included opencdk],
ac_enable_included_opencdk=$withval,
@@ -337,11 +342,12 @@ if test x$ac_enable_included_opencdk = xno;then
]])
)
fi
-fi
AC_MSG_CHECKING([whether to use the included opencdk])
AC_MSG_RESULT($ac_enable_included_opencdk)
+fi
+
AM_CONDITIONAL(ENABLE_INCLUDED_OPENCDK, test "$ac_enable_included_opencdk" = "yes")