gnupg: bump to 1.4.21, add missing aclocal to BUILD_PREREQUIRES. (#772)

This commit is contained in:
fbrosson
2016-08-19 15:00:35 +00:00
committed by waddlesplash
parent 449eebf053
commit 10be182c8c
2 changed files with 22 additions and 12 deletions

View File

@@ -1,11 +1,14 @@
From: fbrosson <fbrosson@users.noreply.github.com>
From 3fb03d8c66fe9e28012f87822fd84c89b06df2b4 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Thu, 18 Feb 2016 22:55:30 +0000
Subject: [PATCH] Fix detection of libnetwork
Subject: Fix detection of libnetwork
diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac
--- gnupg-1.4.20/configure.ac 2015-12-19 14:08:22.000000000 +0000
+++ gnupg-1.4.20-haiku/configure.ac
@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs
diff --git a/configure.ac b/configure.ac
index 8133537..7c90d45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs are static (or dynamic and without
dnl ELF runtime link paths), then link will fail and LDAP support won't
dnl be detected.
@@ -22,7 +25,7 @@ diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac
dnl Now try for the resolver functions so we can use DNS for SRV, PKA,
dnl and CERT.
@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x
@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
_dns_save_libs=$LIBS
LIBS=""
# the double underscore thing is a glibc-ism?
@@ -33,3 +36,6 @@ diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac
AC_SEARCH_LIBS(dn_expand,resolv bind socket,,
AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no))
AC_SEARCH_LIBS(dn_skipname,resolv bind socket,,
--
2.9.2