[Pkg-wmaker-commits] [wmbiff] 41/84: corrections to conditional compilation of gnutls-common for automake 1.5 (and thereby the true automake way)

[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 8b68f5db2fbf498e514aba25092da61d5e9937f6
Author: bluehal <bluehal>
Date:   Tue Jun 25 23:24:26 2002 +0000

    corrections to conditional compilation of gnutls-common for automake 1.5 (and thereby the true automake way)
---
 configure.in       | 8 ++++----
 wmbiff/Makefile.am | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index a9797e2..4a7a593 100644
--- a/configure.in
+++ b/configure.in
@@ -44,9 +44,9 @@ 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) 
+                         GNUTLS_COMMON_O="gnutls-common.o"
+                         GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." 
+                         AC_CHECK_HEADERS(gnutls.h) ])
 else
  AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled)
 fi
@@ -60,7 +60,7 @@ AM_PATH_LIBGCRYPT(1.1.7, [CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
 AC_SUBST(LIBGCRYPT_LIBS)
 AC_SUBST(GNUTLS_MAN_STATUS)
 AC_SUBST(GCRYPT_MAN_STATUS)
-AC_SUBST(GNUTLS_COMMON)
+AC_SUBST(GNUTLS_COMMON_O)
 
 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 1a2f5d3..f97dfe4 100644
--- a/wmbiff/Makefile.am
+++ b/wmbiff/Makefile.am
@@ -3,9 +3,9 @@ noinst_PROGRAMS = test_wmbiff
 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@
-wmbiff_LDADD = -L../wmgeneral -lwmgeneral @LIBGCRYPT_LIBS@
+	passwordMgr.c passwordMgr.h charutil.c charutil.h Client.h 
+EXTRA_wmbiff_SOURCES = gnutls-common.c gnutls-common.h	
+wmbiff_LDADD = -L../wmgeneral -lwmgeneral @LIBGCRYPT_LIBS@ @GNUTLS_COMMON_O@
 wmbiff_DEPENDENCIES = ../wmgeneral/libwmgeneral.a Makefile
 test_wmbiff_SOURCES = ShellClient.c charutil.c charutil.h Client.h \
 	test_wmbiff.c passwordMgr.c
@@ -13,8 +13,7 @@ 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 \
-	gnutls-common.c gnutls-common.h	
+EXTRA_DIST = $(man_MANS) sample.wmbiffrc wmbiff-master-led.xpm 
 
 MAINTAINERCLEANFILES = Makefile.in
 

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