[Pkg-wmaker-commits] [wmbiff] 40/84: only compile gnutls-common.[ch] if gnutls is configured in (duh), and only check for gcrypt.h if libgcrypt is installed and current

[Doug Torrance]

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

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

commit 42b3371e0f8ee1edf45ed44e26c9fcd2ad92e097
Author: bluehal <bluehal>
Date:   Tue Jun 25 23:15:28 2002 +0000

    only compile gnutls-common.[ch] if gnutls is configured in (duh), and only check for gcrypt.h if libgcrypt is installed and current
---
 configure.in       | 7 +++++--
 wmbiff/Makefile.am | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 05db368..a9797e2 100644
--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,7 @@ if test "$gnutls" = "ok"; then
  AM_PATH_LIBGNUTLS(0.4.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
                           CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
                          CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
+                         GNUTLS_COMMON="gnutls-common.c gnutls-common.h"
                          GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." ])
  AC_CHECK_HEADERS(gnutls.h) 
 else
@@ -52,12 +53,14 @@ fi
 GCRYPT_MAN_STATUS="This copy of WMBiff was not compiled with gcrypt."
 AM_PATH_LIBGCRYPT(1.1.7, [CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
                          CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS"
-                         GCRYPT_MAN_STATUS="This copy of WMBiff was compiled with gcrypt."])
-AC_CHECK_HEADERS(gcrypt.h) 
+                         GCRYPT_MAN_STATUS="This copy of WMBiff was compiled with gcrypt."
+                         AC_CHECK_HEADERS(gcrypt.h) ] )
 
 
+AC_SUBST(LIBGCRYPT_LIBS)
 AC_SUBST(GNUTLS_MAN_STATUS)
 AC_SUBST(GCRYPT_MAN_STATUS)
+AC_SUBST(GNUTLS_COMMON)
 
 dnl regex stuff.
 AC_CHECK_HEADERS(regex.h gnuregex.h) dnl linux has regex.h, BSD gnuregex
diff --git a/wmbiff/Makefile.am b/wmbiff/Makefile.am
index 226d9cb..1a2f5d3 100644
--- a/wmbiff/Makefile.am
+++ b/wmbiff/Makefile.am
@@ -4,8 +4,8 @@ bin_PROGRAMS = wmbiff
 wmbiff_SOURCES = wmbiff.c socket.c Pop3Client.c LicqClient.c mboxClient.c \
 	maildirClient.c Imap4Client.c tlsComm.c tlsComm.h ShellClient.c  \
 	passwordMgr.c passwordMgr.h charutil.c charutil.h Client.h \
-	gnutls-common.c gnutls-common.h
-wmbiff_LDADD = -L../wmgeneral -lwmgeneral @LIBGCRYPT_LIBS@ 
+	@GNUTLS_COMMON@
+wmbiff_LDADD = -L../wmgeneral -lwmgeneral @LIBGCRYPT_LIBS@
 wmbiff_DEPENDENCIES = ../wmgeneral/libwmgeneral.a Makefile
 test_wmbiff_SOURCES = ShellClient.c charutil.c charutil.h Client.h \
 	test_wmbiff.c passwordMgr.c
@@ -13,7 +13,8 @@ man_MANS = wmbiff.1 wmbiffrc.5
 skindir = $(datadir)/wmbiff/skins
 skin_DATA = wmbiff-master-led.xpm wmbiff-master-contrast.xpm 
 
-EXTRA_DIST = $(man_MANS) sample.wmbiffrc wmbiff-master-led.xpm
+EXTRA_DIST = $(man_MANS) sample.wmbiffrc wmbiff-master-led.xpm \
+	gnutls-common.c gnutls-common.h	
 
 MAINTAINERCLEANFILES = Makefile.in
 

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