diff options
| author | Daiki Ueno <ueno@gnu.org> | 2019-09-16 15:09:15 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2019-09-16 15:09:15 +0000 |
| commit | d5d9278d887ae84062583d588685070571820426 (patch) | |
| tree | 70e019ce8a41af4a062bc274e72e27879907b309 | |
| parent | 7e5d82c42ccf8e579cedcc85c61a866af6dfd0ca (diff) | |
| parent | 763e31d351933222281bf9c11ff0bddb89bb701d (diff) | |
| download | gnutls-d5d9278d887ae84062583d588685070571820426.tar.gz | |
Merge branch 'wip-guile-3.0' into 'master'
Add support for Guile 3.0
See merge request gnutls/gnutls!1020
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/gnutls-guile.texi | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 710db7608d..71e655771d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -# Copyright (C) 2000-2012, 2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2012, 2016, 2019 Free Software Foundation, Inc. # # Author: Nikos Mavrogiannopoulos, Simon Josefsson # @@ -910,7 +910,7 @@ if test "$opt_guile_bindings" = "yes"; then AC_PATH_PROG([GUILD], [guild]) AC_SUBST([GUILD]) - GUILE_PKG + GUILE_PKG([3.0 2.2 2.0 1.8]) GUILE_PROGS GUILE_SITE_DIR GUILE_FLAGS diff --git a/doc/Makefile.am b/doc/Makefile.am index add63c23d5..8eb30398df 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2000-2012 Free Software Foundation, Inc. +# Copyright (C) 2000-2012, 2019 Free Software Foundation, Inc. # # Author: Nikos Mavrogiannopoulos # @@ -492,7 +492,7 @@ if HAVE_GUILE GUILE_FOR_BUILD = \ GUILE_AUTO_COMPILE=0 \ - $(GUILE) -L $(top_srcdir)/guile/modules + $(GUILE) -q -L $(top_srcdir)/guile/modules SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes \ diff --git a/doc/gnutls-guile.texi b/doc/gnutls-guile.texi index b53349acab..3e0b64d7eb 100644 --- a/doc/gnutls-guile.texi +++ b/doc/gnutls-guile.texi @@ -17,7 +17,7 @@ This manual is last updated @value{UPDATED} for version @value{VERSION} of GnuTLS. -Copyright @copyright{} 2001-2012, 2014, 2016 Free Software Foundation, Inc. +Copyright @copyright{} 2001-2012, 2014, 2016, 2019 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -85,8 +85,8 @@ a large subset thereof is available. @node Guile Preparations @chapter Guile Preparations -The GnuTLS Guile bindings are available for Guile's 2.0 stable series, -as well as the forthcoming 2.2 series and the legacy 1.8 series. +The GnuTLS Guile bindings are available for the Guile 3.0 and 2.2 +series, as well as the legacy 2.0 and even 1.8 series. By default they are installed under the GnuTLS installation directory, typically @file{/usr/local/share/guile/site/}). Normally Guile |