From: Paul Eggert <eggert@cs.ucla.edu>
To: Glenn Morris <rgm@gnu.org>, emacs-devel@gnu.org
Subject: Re: master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later
Date: Wed, 3 Aug 2016 14:32:41 -0700 [thread overview]
Message-ID: <f0b14f84-73e2-0c5b-6f4e-be0fd4a6ebcb@cs.ucla.edu> (raw)
In-Reply-To: <c2fuql98gg.fsf@fencepost.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
On 08/03/2016 08:29 AM, Glenn Morris wrote:
> Ref: http://hydra.nixos.org/build/38241199
> sysdep.c:99:28: fatal error: gnutls/crypto.h: No such file or directory
Thanks, I installed the attached, which should fix that.
Hydra doesn't have the GnuTLS development headers/libraries installed.
Shouldn't it? Seems a bit odd, since Hydra *builds* GnuTLS....
[-- Attachment #2: 0001-Fix-GnuTLS-includes.txt --]
[-- Type: text/plain, Size: 1505 bytes --]
From 11a3a8ae795412f009d88ab7ec3bc10494a1a849 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 3 Aug 2016 14:20:38 -0700
Subject: [PATCH] Fix GnuTLS includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* src/gnutls.c [HAVE_GNUTLS]: Don’t include gnutls/gnutls.h
a second time; although it doesn’t hurt, it’s not needed.
* src/sysdep.c [!HAVE_GNUTLS]: Don’t include gnutls/crypto.h,
as it may not be available. Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00100.html
---
src/gnutls.c | 1 -
src/sysdep.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gnutls.c b/src/gnutls.c
index d242919..af2ba52 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -26,7 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "coding.h"
#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
#ifdef WINDOWSNT
#include <windows.h>
diff --git a/src/sysdep.c b/src/sysdep.c
index 43ff0a1..70cb961 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -95,7 +95,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "gnutls.h"
/* MS-Windows loads GnuTLS at run time, if available; we don't want to
do that during startup just to call gnutls_rnd. */
-#ifndef WINDOWSNT
+#if defined HAVE_GNUTLS && !defined WINDOWSNT
# include <gnutls/crypto.h>
#else
# define emacs_gnutls_global_init() Qnil
--
2.5.5
next prev parent reply other threads:[~2016-08-03 21:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160803120234.4954.40736@vcs.savannah.gnu.org>
[not found] ` <20160803120235.44F4E220169@vcs.savannah.gnu.org>
2016-08-03 15:29 ` master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later Glenn Morris
2016-08-03 21:32 ` Paul Eggert [this message]
2016-08-03 21:47 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f0b14f84-73e2-0c5b-6f4e-be0fd4a6ebcb@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.