badrihippo
/
guile-strickenmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update support for Guile 3.0

This commit is contained in:
Erik Edrosa 2020-04-10 07:23:36 -04:00
parent 5a00afc817
commit 3aee562864
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
GUILE_PKG([2.2 2.0]) GUILE_PKG([3.0 2.2 2.0])
GUILE_PROGS GUILE_PROGS
if test "x$GUILD" = "x"; then if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])

2
guix.scm
View File

@ -31,7 +31,7 @@
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-3.0)))
(synopsis "CommonMark parser for Guile") (synopsis "CommonMark parser for Guile")
(description (description
"guile-commonmark is a library for parsing CommonMark, a fully specified "guile-commonmark is a library for parsing CommonMark, a fully specified

10
m4/guile.m4
View File

@ -47,8 +47,8 @@
# for an available version of Guile. # for an available version of Guile.
# #
# By default, this macro will search for the latest stable version of # By default, this macro will search for the latest stable version of
# Guile (e.g. 2.2), falling back to the previous stable version # Guile (e.g. 3.0), falling back to the previous stable version
# (e.g. 2.0) if it is available. If no guile-@var{VERSION}.pc file is # (e.g. 2.2) if it is available. If no guile-@var{VERSION}.pc file is
# found, an error is signalled. The found version is stored in # found, an error is signalled. The found version is stored in
# @var{GUILE_EFFECTIVE_VERSION}. # @var{GUILE_EFFECTIVE_VERSION}.
# #
@ -61,7 +61,7 @@
# #
AC_DEFUN([GUILE_PKG], AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG [PKG_PROG_PKG_CONFIG
_guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp="" _guile_tmp=""
for v in $_guile_versions_to_search; do for v in $_guile_versions_to_search; do
@ -221,7 +221,7 @@ AC_DEFUN([GUILE_SITE_DIR],
# as well. # as well.
# #
# By default, this macro will search for the latest stable version of # By default, this macro will search for the latest stable version of
# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older # Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older
# version is found, the macro will signal an error. # version is found, the macro will signal an error.
# #
# The effective version of the found @code{guile} is set to # The effective version of the found @code{guile} is set to
@ -237,7 +237,7 @@ AC_DEFUN([GUILE_SITE_DIR],
AC_DEFUN([GUILE_PROGS], AC_DEFUN([GUILE_PROGS],
[_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
if test -z "$_guile_required_version"; then if test -z "$_guile_required_version"; then
_guile_required_version=2.2 _guile_required_version=3.0
fi fi
_guile_candidates=guile _guile_candidates=guile