diff options
| author | David Shaw <[email protected]> | 2006-11-06 03:59:02 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-11-06 03:59:02 +0000 |
| commit | d46be5e103b9db894ec2b6b2acf10fbd3ba98c75 (patch) | |
| tree | f46780cc230c7d2e2be831487671a694e07b9154 | |
| parent | * gpgkeys_hkp.c (curl_mrindex_writer): Revert previous change. (diff) | |
| download | gnupg-d46be5e103b9db894ec2b6b2acf10fbd3ba98c75.tar.gz gnupg-d46be5e103b9db894ec2b6b2acf10fbd3ba98c75.zip | |
* configure.ac: --enable-minimal leaves out gettext and all resolver
functions (SRV, PKA, & CERT).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 35 |
2 files changed, 25 insertions, 15 deletions
@@ -1,3 +1,8 @@ +2006-11-05 David Shaw <[email protected]> + + * configure.ac: --enable-minimal leaves out gettext and all + resolver functions (SRV, PKA, & CERT). + 2006-10-02 Werner Koch <[email protected]> * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add case for mingw32 diff --git a/configure.ac b/configure.ac index 3e0941d95..196c90932 100644 --- a/configure.ac +++ b/configure.ac @@ -132,6 +132,8 @@ dnl binary try_extensions=no +try_gettext=yes +try_dns=yes use_rsa=yes use_idea=yes use_cast5=yes @@ -148,6 +150,8 @@ disable_keyserver_path=no AC_ARG_ENABLE(minimal, AC_HELP_STRING([--enable-minimal],[build the smallest gpg binary possible]), + try_gettext=no + try_dns=no use_rsa=no use_idea=no use_cast5=no @@ -464,7 +468,6 @@ GNUPG_CHECK_USTAR MPI_OPT_FLAGS="" -try_gettext=yes have_dosish_system=no need_dlopen=yes case "${host}" in @@ -578,22 +581,24 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, dnl Now try for the resolver functions so we can use DNS for SRV, PKA, dnl and CERT. -if test x"$try_hkp" = xyes || test x"$try_http" = xyes ; then - AC_ARG_ENABLE(dns-srv, - AC_HELP_STRING([--disable-dns-srv], - [disable the use of DNS SRV in HKP and HTTP]), - use_dns_srv=$enableval,use_dns_srv=yes) -fi +if test x"$try_dns" = xyes ; then + if test x"$try_hkp" = xyes || test x"$try_http" = xyes ; then + AC_ARG_ENABLE(dns-srv, + AC_HELP_STRING([--disable-dns-srv], + [disable the use of DNS SRV in HKP and HTTP]), + use_dns_srv=$enableval,use_dns_srv=yes) + fi -AC_ARG_ENABLE(dns-pka, - AC_HELP_STRING([--disable-dns-pka], - [disable the use of PKA records in DNS]), - use_dns_pka=$enableval,use_dns_pka=yes) + AC_ARG_ENABLE(dns-pka, + AC_HELP_STRING([--disable-dns-pka], + [disable the use of PKA records in DNS]), + use_dns_pka=$enableval,use_dns_pka=yes) -AC_ARG_ENABLE(dns-cert, - AC_HELP_STRING([--disable-dns-cert], - [disable the use of CERT records in DNS]), - use_dns_cert=$enableval,use_dns_cert=yes) + AC_ARG_ENABLE(dns-cert, + AC_HELP_STRING([--disable-dns-cert], + [disable the use of CERT records in DNS]), + use_dns_cert=$enableval,use_dns_cert=yes) +fi if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then _dns_save_libs=$LIBS |