[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Let configure find all needed files with guile-2.2 (issue 320800043 by a
From: |
thomasmorley65 |
Subject: |
Let configure find all needed files with guile-2.2 (issue 320800043 by address@hidden) |
Date: |
Tue, 28 Mar 2017 02:58:21 -0700 |
Reviewers: ,
Message:
This is needed to compile LilyPond with guile-2.2.x
Please review.
Description:
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
Please review this at https://codereview.appspot.com/320800043/
Affected files (+9, -3 lines):
M aclocal.m4
M configure.ac
Index: aclocal.m4
diff --git a/aclocal.m4 b/aclocal.m4
index
ed47b8350efe006c1bf6443d775b79bd282ebece..6624a5effa906b3ced50bce3ee18c5f44c653cc5
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
Index: configure.ac
diff --git a/configure.ac b/configure.ac
index
d77ea1588120c1dccbf0980cded2798251579cc5..ffdc24de22b88532455009fc86beda6d84341cb0
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Let configure find all needed files with guile-2.2 (issue 320800043 by address@hidden),
thomasmorley65 <=