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

allow specifying a required version in GUILE_PROGS

Browse source 
* meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
  required Guile version. By default, it requires Guile >= 2.0. A micro
  version can also be specified (e.g. GUILE_PROGS([2.0.10])).

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Aleix Conchillo Flaque 2013-10-03 15:49:07 -07:00 • committed by Ludovic Courtès
parent 0b83be7eb6
commit ecf0498df5
1 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

45
meta/guile.m4
View file

@ -1,17 +1,17 @@
## Autoconf macros for working with Guile. ## Autoconf macros for working with Guile.
## ##
## Copyright (C) 1998,2001, 2006, 2010, 2012 Free Software Foundation, Inc. ## Copyright (C) 1998,2001, 2006, 2010, 2012, 2013 Free Software Foundation, Inc.
## ##
## This library is free software; you can redistribute it and/or ## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public License ## modify it under the terms of the GNU Lesser General Public License
## as published by the Free Software Foundation; either version 3 of ## as published by the Free Software Foundation; either version 3 of
## the License, or (at your option) any later version. ## the License, or (at your option) any later version.
## ##
## This library is distributed in the hope that it will be useful, ## This library is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of ## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## Lesser General Public License for more details. ## Lesser General Public License for more details.
## ##
## You should have received a copy of the GNU Lesser General Public ## You should have received a copy of the GNU Lesser General Public
## License along with this library; if not, write to the Free Software ## License along with this library; if not, write to the Free Software
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@ -177,12 +177,16 @@ AC_DEFUN([GUILE_SITE_DIR],
# GUILE_PROGS -- set paths to Guile interpreter, config and tool programs # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
# #
# Usage: GUILE_PROGS # Usage: GUILE_PROGS([VERSION])
# #
# This macro looks for programs @code{guile} and @code{guild}, setting # This macro looks for programs @code{guile} and @code{guild}, setting
# variables @var{GUILE} and @var{GUILD} to their paths, respectively. # variables @var{GUILE} and @var{GUILD} to their paths, respectively.
# If @code{guile} is not found, signal an error. # If @code{guile} is not found, signal an error.
# #
# 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
# 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
# @var{GUILE_EFFECTIVE_VERSION}. This macro ensures that the effective # @var{GUILE_EFFECTIVE_VERSION}. This macro ensures that the effective
# version is compatible with the result of a previous invocation of # version is compatible with the result of a previous invocation of
@ -195,18 +199,43 @@ AC_DEFUN([GUILE_SITE_DIR],
# #
AC_DEFUN([GUILE_PROGS], AC_DEFUN([GUILE_PROGS],
[AC_PATH_PROG(GUILE,guile) [AC_PATH_PROG(GUILE,guile)
_guile_required_version="m4_default([$1], [2.0])"
if test "$GUILE" = "" ; then if test "$GUILE" = "" ; then
AC_MSG_ERROR([guile required but not found]) AC_MSG_ERROR([guile required but not found])
fi fi
AC_SUBST(GUILE) AC_SUBST(GUILE)
_guile_prog_version=`$GUILE -c "(display (effective-version))"` _guile_effective_version=`$GUILE -c "(display (effective-version))"`
if test -z "$GUILE_EFFECTIVE_VERSION"; then if test -z "$GUILE_EFFECTIVE_VERSION"; then
GUILE_EFFECTIVE_VERSION=$_guile_prog_version GUILE_EFFECTIVE_VERSION=$_guile_effective_version
elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_prog_version"; then elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_prog_version]) AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
fi fi
_guile_major_version=`$GUILE -c "(display (major-version))"`
_guile_minor_version=`$GUILE -c "(display (minor-version))"`
_guile_micro_version=`$GUILE -c "(display (micro-version))"`
_guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version"
AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
_major_version=`echo $_guile_required_version | cut -d . -f 1`
_minor_version=`echo $_guile_required_version | cut -d . -f 2`
_micro_version=`echo $_guile_required_version | cut -d . -f 3`
if test "$_guile_major_version" -ge "$_major_version"; then
if test "$_guile_minor_version" -ge "$_minor_version"; then
if test -n "$_micro_version"; then
if test "$_guile_micro_version" -lt "$_micro_version"; then
AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
fi
fi
else
AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
fi
else
AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
fi
AC_MSG_RESULT([$_guile_prog_version])
AC_PATH_PROG(GUILD,guild) AC_PATH_PROG(GUILD,guild)
AC_SUBST(GUILD) AC_SUBST(GUILD)