[svn] GnuPG - r4326 - branches/STABLE-BRANCH-1-4

[svn author dshaw]

Author: dshaw
Date: 2006-11-06 04:59:02 +0100 (Mon, 06 Nov 2006)
New Revision: 4326

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
Log:
* configure.ac: --enable-minimal leaves out gettext and all resolver
functions (SRV, PKA, & CERT).


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2006-11-06 03:37:08 UTC (rev 4325)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2006-11-06 03:59:02 UTC (rev 4326)
@@ -1,3 +1,8 @@
+2006-11-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: --enable-minimal leaves out gettext and all
+	resolver functions (SRV, PKA, & CERT).
+
 2006-10-02  Werner Koch  <wk at g10code.com>
 
 	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add case for mingw32

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2006-11-06 03:37:08 UTC (rev 4325)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2006-11-06 03:59:02 UTC (rev 4326)
@@ -132,6 +132,8 @@
 
 try_extensions=no
 
+try_gettext=yes
+try_dns=yes
 use_rsa=yes
 use_idea=yes
 use_cast5=yes
@@ -148,6 +150,8 @@
 
 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 @@
 
 MPI_OPT_FLAGS=""
 
-try_gettext=yes
 have_dosish_system=no
 need_dlopen=yes
 case "${host}" in
@@ -578,22 +581,24 @@
 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