diff options
| author | Danny O'Brien <danny@codetherapy.space> | 2020-09-07 19:52:17 -0700 |
|---|---|---|
| committer | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2020-10-31 10:43:49 +0200 |
| commit | 623cf787ad009c42b2adf3767be5f01fec56ff5a (patch) | |
| tree | 29432fe0b913dffe885fa0d5883c804c3ef9e5c0 /m4 | |
| parent | 69b157a346b73e0d447f2aebfb3ddb6f3c159d40 (diff) | |
guile: support version 3.0.
Includes an update to the guile m4 package, and tweaks the build so that
both 2.2 and 3.0 should work fine.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/guile.m4 (renamed from m4/guile-2.2.m4) | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index eeb8a05..27a49ee 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -41,7 +41,7 @@ EXTRA_DIST= \ ax_lib_readline.m4 \ ax_require_defined.m4 \ ax_valgrind_check.m4 \ - guile-2.2.m4 \ + guile.m4 \ lib-ld.m4 \ lib-link.m4 \ lib-prefix.m4 diff --git a/m4/guile-2.2.m4 b/m4/guile.m4 index 89823e9..6968973 100644 --- a/m4/guile-2.2.m4 +++ b/m4/guile.m4 @@ -47,8 +47,8 @@ # for an available version of Guile. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.2), falling back to the previous stable version -# (e.g. 2.0) if it is available. If no guile-@var{VERSION}.pc file is +# Guile (e.g. 3.0), falling back to the previous stable version +# (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 # @var{GUILE_EFFECTIVE_VERSION}. # @@ -60,8 +60,11 @@ # @code{AC_SUBST}. # AC_DEFUN([GUILE_PKG], - [PKG_PROG_PKG_CONFIG - _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" + [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + if test "x$PKG_CONFIG" = x; then + AC_MSG_ERROR([pkg-config is missing, please install it]) + fi + _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])" if test -n "$GUILE_EFFECTIVE_VERSION"; then _guile_tmp="" for v in $_guile_versions_to_search; do @@ -221,7 +224,7 @@ AC_DEFUN([GUILE_SITE_DIR], # as well. # # 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. # # The effective version of the found @code{guile} is set to @@ -237,7 +240,7 @@ AC_DEFUN([GUILE_SITE_DIR], AC_DEFUN([GUILE_PROGS], [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" if test -z "$_guile_required_version"; then - _guile_required_version=2.2 + _guile_required_version=3.0 fi _guile_candidates=guile |