1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Wed, 11 Nov 2015 13:35:46 +0100
Subject: [PATCH] Make guile support selectable
---
configure.ac | 55 +++++++++++++++++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48ab828..ce7ba74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
### --------------------------------------------------------------------------
### Guile version checks
+GUILE_EFFECTIVE_VERSION=0
# - check minimum version
# - determine GUILE_CFLAGS and GUILE_LIBS
-gnc_have_guile_2=no
-gnc_have_guile_www=no
-PKG_CHECK_MODULES(GUILE,
- [guile-2.0 >= 2.0.0],
- [gnc_have_guile_2=yes
- GUILE_EFFECTIVE_VERSION=2.0
- AC_PATH_PROG([GUILD], guild)],
- [PKG_CHECK_MODULES(GUILE,
- [guile-1.8 >= 1.8.5],
- [GUILE_EFFECTIVE_VERSION=1.8],
- [AC_MSG_ERROR([
- guile does not appear to be installed correctly, or is not in the
- correct version range. Perhaps you have not installed the guile
- development packages? Gnucash requires at least version 1.8.5 to build.
- ])])
-])
-AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
+AC_ARG_WITH([guile],
+ AS_HELP_STRING([--with-guile=1.8|2.0|auto],
+ [which guile version to compile against @<:@default: auto@:>@]),
+ [],
+ [with_guile=auto]
+)
+
+AS_IF([test "$with_guile" = "2.0"],
+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
+ [GUILE_EFFECTIVE_VERSION=2.0
+ AC_PATH_PROG([GUILD], guild)])],
+ [test "$with_guile" = "1.8"],
+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
+ [GUILE_EFFECTIVE_VERSION=1.8])],
+ [test "$with_guile" = "auto"],
+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
+ [GUILE_EFFECTIVE_VERSION=2.0
+ AC_PATH_PROG([GUILD], guild)],
+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
+ [GUILE_EFFECTIVE_VERSION=1.8],
+ [GUILE_EFFECTIVE_VERSION=0])
+ ])],
+ # else
+ [AC_MSG_ERROR([invalid guile version specified])]
+)
+
+AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
+ [AC_MSG_ERROR([
+ guile does not appear to be installed correctly, or is not in the
+ correct version range. Perhaps you have not installed the guile
+ development packages? Gnucash requires at least version 1.8.5 to build.
+ ])]
+)
+
+AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
AC_SUBST(GUILE_EFFECTIVE_VERSION)
AC_SUBST(GUILE, [`pwd`/gnc-guile])
@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
then
AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
- if test "${gnc_have_guile_2}" = yes
+ if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
then
if test "${gnc_have_swig_2_0_10}" = no
then
--
2.6.3
|
GitWeb