diff options
| author | Werner Koch <wk@gnupg.org> | 2014-10-03 12:35:22 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-10-03 12:35:22 +0200 |
| commit | 6522a68d8d11e15ee77102e6830f251c2d9f440d (patch) | |
| tree | 4bda0169c183fdc8173e885472b2f1bcc3361987 | |
| parent | gpg: Check gpg-agent version before 2.1 migration. (diff) | |
| download | gnupg2-6522a68d8d11e15ee77102e6830f251c2d9f440d.tar.xz gnupg2-6522a68d8d11e15ee77102e6830f251c2d9f440d.zip | |
build: Add configure options --disable-{ntb,gnu}tls.
* configure.ac: Add --disable-ntbtls and --disable-gnutls.
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 9e1dd8943..28268f11c 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,7 @@ have_libgcrypt=no have_libassuan=no have_ksba=no have_ntbtls=no +have_gnutls=no have_npth=no have_libusb=no have_adns=no @@ -829,16 +830,27 @@ fi # NTBTLS is our TLS library. If it is not available fallback to # GNUTLS. # -AM_PATH_NTBTLS("$NEED_NTBTLS_API:$NEED_NTBTLS_VERSION", - [have_ntbtls=yes],[have_ntbtls=no]) - +AC_ARG_ENABLE(ntbtls, + AC_HELP_STRING([--disable-ntbtls], + [disable the use of NTBTLS as TLS library]), + try_ntbtls=$enableval, try_ntbtls=yes) +if test x"$try_ntbtls" = xyes ; then + AM_PATH_NTBTLS("$NEED_NTBTLS_API:$NEED_NTBTLS_VERSION", + [have_ntbtls=yes],[have_ntbtls=no]) +fi if test "$have_ntbtls" = yes ; then use_tls_library=ntbtls AC_DEFINE(HTTP_USE_NTBTLS, 1, [Enable NTBTLS support in http.c]) else - PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $NEED_GNUTLS_VERSION], - [have_gnutls=yes], - [have_gnutls=no]) + AC_ARG_ENABLE(gnutls, + AC_HELP_STRING([--disable-gnutls], + [disable GNUTLS as fallback TLS library]), + try_gnutls=$enableval, try_gnutls=yes) + if test x"$try_gnutls" = xyes ; then + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $NEED_GNUTLS_VERSION], + [have_gnutls=yes], + [have_gnutls=no]) + fi if test "$have_gnutls" = "yes"; then AC_SUBST([LIBGNUTLS_CFLAGS]) AC_SUBST([LIBGNUTLS_LIBS]) |