[Pkg-wmaker-commits] [wmbiff] 03/05: add --disable-crypto

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_20
in repository wmbiff.

commit 6fade345b5db6f3d3d9a819282e8d00b95e13c5a
Author: bluehal <bluehal>
Date:   Tue Dec 30 19:44:02 2003 +0000

    add --disable-crypto
---
 Makefile.am  |  2 ++
 NEWS         |  6 +++++-
 configure.ac | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3cd79bc..313f8e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = wmgeneral wmbiff autoconf scripts
 EXTRA_DIST = ChangeLog FAQ README.licq TODO
 
 ACLOCAL_FLAGS = -I autoconf
+## dummies.
+ACLOCAL = @ACLOCAL@ $(ACLOCAL_FLAGS)
 
 ## no longer needed AUTOHEADER = @AUTOHEADER@ -l autoconf
 
diff --git a/NEWS b/NEWS
index 7e19eb0..b6b8b83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 Release Notes
 ~~~~~~~~~~~~~
+Release 0.4.20 - 
+  * Add --disable-crypto for source-based distributions 
+    while libgcrypt is unstable.
+
 Release 0.4.19 - November 8, 2003
   * Fix test_tlscomm with the right signature for read()
   * Another bugfix to IMAP msglst when headers are abnormal.
@@ -454,4 +458,4 @@ Release 0.1 - Wed, 17 Nov 1999 00:00:00 +0000
   * Initial release by Gennady Belyakov <gb at ccat.elect.ru>.
 
 
-$Id: NEWS,v 1.53 2003/11/09 03:16:47 bluehal Exp $
+$Id: NEWS,v 1.54 2003/12/30 19:44:02 bluehal Exp $
diff --git a/configure.ac b/configure.ac
index c7d0e47..e903e9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl and configure:
 dnl  installation prefix
 dnl  version
 
-AC_INIT(WMBiff, 0.4.19, wmbiff-devel at lists.sourceforge.net, wmbiff)
+AC_INIT(WMBiff, 0.4.20, wmbiff-devel at lists.sourceforge.net, wmbiff)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_INIT_AUTOMAKE(wmbiff, 0.4.19) dnl tarded syntax for automake <= 1.5
 AM_CONFIG_HEADER(config.h)
@@ -56,6 +56,7 @@ AC_CHECK_LIB(resolv, herror)
 
 dnl Pre-gnutls.
 gnutls="ok"
+gcrypt="ok"
 AC_CHECK_LIB(z, gzopen, [], [gnutls="nope"]) dnl GNUTLS seems to need libz; fail here if it's missing.
 dnl perhaps not required anymore:
 dnl AC_CHECK_LIB(gdbm, dbminit, [], [gnutls="nope"]) dnl GNUTLS seems to need libgdbm; fail here if it's missing.
@@ -64,6 +65,12 @@ dnl Parameter is minimum version
 dnl TODO: fix so that GCRYPT is tested only if GNUTLS fails; the dependence
 dnl between them makes this turn redundant
 
+AC_ARG_ENABLE(crypto, AC_HELP_STRING([ --disable-crypto ], [ disable gnutls/gcrypt ]), 
+                      [ if test $enableval != yes; then 
+                        gnutls="disabled"
+                        gcrypt="disabled"
+                       fi ])
+                      
 
 GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
 if test "$gnutls" = "ok"; then
@@ -77,12 +84,17 @@ if test "$gnutls" = "ok"; then
 else
  AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled)
 fi
+
 GCRYPT_MAN_STATUS="This copy of WMBiff was not compiled with gcrypt."
-AM_PATH_LIBGCRYPT(1.1.8, [CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
+if test "$gcrypt" = "ok"; then
+ AM_PATH_LIBGCRYPT(1.1.8, [CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
                          CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS"
                          GCRYPT_MAN_STATUS="This copy of WMBiff was compiled with gcrypt."
                          AC_CHECK_HEADERS(gcrypt.h) ],
                          [ echo libgcrypt can be found at ftp://ftp.gnupg.org/pub/gcrypt/alpha/libgcrypt/ ]  )
+else
+        AC_MSG_RESULT(GCRYPT disabled.)                        
+fi;
 
 
 AC_SUBST(LIBGCRYPT_LIBS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git