On Fri, Mar 08, 2019 at 07:21:22PM +0100, Andreas Metzler wrote: > On 2019-03-08 Yavor Doganov <ya...@gnu.org> wrote: > > | checking for gzopen in -lz... no > > | GNUTLS support requires libz.a and libgdbm.a > > Actually ./configure seems to wrong, GNUTLS suppport does not require > libz.a and libgdbm.a (anymore).
Thanks; here is a better patch.
>From da55170615c095d2076a839d335f1071ceb8f906 Mon Sep 17 00:00:00 2001 From: Yavor Doganov <ya...@gnu.org> Date: Sat, 9 Mar 2019 08:30:55 +0200 Subject: [PATCH] debian/patches: (gnutls-detection.patch) Detect GNUTLS unconditionally. --- debian/patches/gnutls-detection.patch | 40 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/gnutls-detection.patch create mode 100644 debian/patches/series diff --git a/debian/patches/gnutls-detection.patch b/debian/patches/gnutls-detection.patch new file mode 100644 index 0000000..acb58bb --- /dev/null +++ b/debian/patches/gnutls-detection.patch @@ -0,0 +1,40 @@ +Description: Detect GNUTLS unconditionally. +Author: Yavor Doganov <ya...@gnu.org> +Debian-Bug: https://bugs.debian.org/924010 +Forwarded: no +Last-Update: 2019-03-09 +--- + +--- wmbiff.orig/configure.ac ++++ wmbiff/configure.ac +@@ -58,11 +58,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. + + dnl Parameter is minimum version + dnl TODO: fix so that GCRYPT is tested only if GNUTLS fails; the dependence +@@ -76,17 +72,13 @@ + + + GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS." +-if test "$gnutls" = "ok"; then +- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls > 2.2.0], [LIBS="$LIBS $LIBGNUTLS_LIBS" ++PKG_CHECK_MODULES([LIBGNUTLS], [gnutls > 2.2.0], [LIBS="$LIBS $LIBGNUTLS_LIBS" + CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" + CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" + GNUTLS_COMMON_O="gnutls-common.o" + GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." + AC_CHECK_HEADERS(gnutls/gnutls.h) ], + [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ]) +-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." + if test "$gcrypt" = "ok"; then diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..99fe75a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +gnutls-detection.patch -- 2.20.1
