mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Merge remote-tracking branch 'origin/stable-2.2'

Browse source
This commit is contained in:
Andy Wingo 2017-05-31 21:54:26 +02:00
commit cfe2279fea
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meta/guile.m4
View file

@ -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.0 1.8])" _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
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.0). x.y or x.y.z versions can be specified. If an older # Guile (e.g. 2.2). 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.0 _guile_required_version=2.2
fi fi
_guile_candidates=guile _guile_candidates=guile