[Pkg-wmaker-commits] [wmbiff] 10/77: don't try to configure gnutls if libz or libgdbm aren't installed

[Doug Torrance]

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

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

commit a1b76d2cee556077dd2007ae64412c3d3ea4f967
Author: bluehal <bluehal>
Date:   Sun Apr 7 19:30:59 2002 +0000

    don't try to configure gnutls if libz or libgdbm aren't installed
---
 configure.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index f78156e..de92dda 100644
--- a/configure.in
+++ b/configure.in
@@ -24,18 +24,22 @@ if test -n "$GCC"; then
 fi
 
 dnl Pre-gnutls.
-AC_CHECK_LIB(z, gzopen) dnl GNUTLS seems to need libz; fail here if it's missing.
-AC_CHECK_LIB(gdbm, dbminit) dnl GNUTLS seems to need libgdbm; fail here if it's missing.
+gnutls="ok"
+AC_CHECK_LIB(z, gzopen, , gnutls="nope") dnl GNUTLS seems to need libz; fail here if it's missing.
+AC_CHECK_LIB(gdbm, dbminit, , gnutls="nope") dnl GNUTLS seems to need libgdbm; fail here if it's missing.
 
 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
 
-AM_PATH_LIBGNUTLS(0.3.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
+if test "$gnutls" == "ok"; then
+ AM_PATH_LIBGNUTLS(0.3.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
                          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"])
+ AC_CHECK_HEADERS(gnutls.h) 
+fi
 AM_PATH_LIBGCRYPT(1.1.5, [LIBS="$LIBS $LIBGCRYPT_LIBS"
                          CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"])
-AC_CHECK_HEADERS(gnutls.h gcrypt.h) 
+AC_CHECK_HEADERS(gcrypt.h) 
 
 dnl regex stuff.
 AC_CHECK_HEADERS(regex.h gnuregex.h) dnl linux has regex.h, BSD gnuregex

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