Hi all,
guile-2.2 is released. So I plan to implement most patches from the
remotes/origin/dev/guile-v2-work-branch and those I've put locally on
top of it.
This will sometimes require some updating of those patches. Most of
them were created to make lily work with guile-2.0.x. Also, I'd like
to check whether those patches are still all needed: guile-devs
claimed a far better port-encoding-handling wrt to utf-8, etc. We will
see...
The main question:
I'd like to facilitate review by putting them on one by one.
Though this may result in commits with only partly working LilyPond,
if compiled with guile-2.2
For example the attached.
It makes configure find all the needed files when done with --enable-guile2
But make will fail.
(lily with guile-1.8 should be unaffected.)
It's meant to replace
fd6919c8fec9a61d1c7b6abc54ac5607bd62a0b9
from branch remotes/origin/dev/guile-v2-work
How to proceed?
Cheers,
Harm
From c4ec7dadd372a0e7f148bcfeacff382add548745 Mon Sep 17 00:00:00 2001
From: Thomas Morley <thomasmorle...@gmail.com>
Date: Sun, 19 Mar 2017 14:29:04 +0100
Subject: [PATCH] Let configure find all needed files with guile-2.2
in configure.ac
Adds support for STEPMAKE_GUILE
Update guile-versions for STEPMAKE_GUILE and STEPMAKE_GUILE_DEVEL
in aclocal.m4
update the list to search for guile-config
Many thanks to Antonio Ospite
---
aclocal.m4 | 2 +-
configure.ac | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index ed47b83..6624a5e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -658,7 +658,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
AC_MSG_CHECKING([for guile-config])
guile_config="guile-config"
found="no"
- for r in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile2-config guile2.0-config guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; do
+ for r in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile-2.2-config guile2.2-config guile2-config guile2.0-config guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; do
exe=`STEPMAKE_GET_EXECUTABLE($r)`
if ! $exe --version > /dev/null 2>&1 ; then
continue
diff --git a/configure.ac b/configure.ac
index d77ea15..ffdc24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,7 @@ STEPMAKE_TEXMF(REQUIRED)
STEPMAKE_TEXMF_DIRS(REQUIRED)
if test "$GUILEv2" = "yes"
then
- STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.2.0)
+ STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.3.0)
else
STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
fi
@@ -267,7 +267,13 @@ STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
STEPMAKE_WINDOWS
# guile executable for some scripts
-STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+ # guile executable for some scripts
+ if test "$GUILEv2" = "yes"
+ then
+ STEPMAKE_GUILE(OPTIONAL, 2.0.7, 2.3.0)
+ else
+ STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+ fi
# perl for help2man and for mf2pt1.pl
STEPMAKE_PERL(REQUIRED)
--
2.7.4
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
