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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
--- libmatheval-1.1.11-v/configure 2018-07-13 11:16:19.115719477 +0200
+++ libmatheval-1.1.11/configure 2018-07-13 11:33:07.914093005 +0200
@@ -640,6 +640,7 @@
GUILE_CFLAGS
GUILE_TOOLS
GUILE_CONFIG
+GUILE_EFFECTIVE_VERSION
GUILE
AUTOM4TE
YFLAGS
@@ -4831,21 +4832,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -12267,8 +12253,9 @@
break
fi
done
+# start patch
-
+CPPFLAGS="$GUILE_CFLAGS -DSCM_ENABLE_DEPRECATED=0 $CPPFLAGS"
ac_fn_c_check_type "$LINENO" "scm_t_bits" "ac_cv_type_scm_t_bits" "#include <libguile.h>
"
if test "x$ac_cv_type_scm_t_bits" = xyes; then :
@@ -12276,14 +12263,15 @@
$as_echo "#define HAVE_SCM_T_BITS 1" >>confdefs.h
fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_c_define_gsubr in -lguile" >&5
-$as_echo_n "checking for scm_c_define_gsubr in -lguile... " >&6; }
-if ${ac_cv_lib_guile_scm_c_define_gsubr+:} false; then :
+GUILE_EFFECTIVE_VERSION=2.0
+as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_c_define_gsubr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_c_define_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION" >&5
+$as_echo_n "checking for scm_c_define_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lguile $GUILE_LDFLAGS $LIBS"
+LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12303,29 +12291,31 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_guile_scm_c_define_gsubr=yes
+ eval "$as_ac_Lib=yes"
else
- ac_cv_lib_guile_scm_c_define_gsubr=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_c_define_gsubr" >&5
-$as_echo "$ac_cv_lib_guile_scm_c_define_gsubr" >&6; }
-if test "x$ac_cv_lib_guile_scm_c_define_gsubr" = xyes; then :
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
$as_echo "#define HAVE_SCM_C_DEFINE_GSUBR 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_make_gsubr in -lguile" >&5
-$as_echo_n "checking for scm_make_gsubr in -lguile... " >&6; }
-if ${ac_cv_lib_guile_scm_make_gsubr+:} false; then :
+as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_make_gsubr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_make_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION" >&5
+$as_echo_n "checking for scm_make_gsubr in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lguile $GUILE_LDFLAGS $LIBS"
+LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12345,29 +12335,31 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_guile_scm_make_gsubr=yes
+ eval "$as_ac_Lib=yes"
else
- ac_cv_lib_guile_scm_make_gsubr=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_make_gsubr" >&5
-$as_echo "$ac_cv_lib_guile_scm_make_gsubr" >&6; }
-if test "x$ac_cv_lib_guile_scm_make_gsubr" = xyes; then :
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
$as_echo "#define HAVE_SCM_MAKE_GSUBR 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_num2dbl in -lguile" >&5
-$as_echo_n "checking for scm_num2dbl in -lguile... " >&6; }
-if ${ac_cv_lib_guile_scm_num2dbl+:} false; then :
+as_ac_Lib=`$as_echo "ac_cv_lib_guile-$GUILE_EFFECTIVE_VERSION''_scm_num2dbl" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scm_num2dbl in -lguile-$GUILE_EFFECTIVE_VERSION" >&5
+$as_echo_n "checking for scm_num2dbl in -lguile-$GUILE_EFFECTIVE_VERSION... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lguile $GUILE_LDFLAGS $LIBS"
+LIBS="-lguile-$GUILE_EFFECTIVE_VERSION $GUILE_LDFLAGS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12387,22 +12379,25 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_guile_scm_num2dbl=yes
+ eval "$as_ac_Lib=yes"
else
- ac_cv_lib_guile_scm_num2dbl=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_guile_scm_num2dbl" >&5
-$as_echo "$ac_cv_lib_guile_scm_num2dbl" >&6; }
-if test "x$ac_cv_lib_guile_scm_num2dbl" = xyes; then :
+eval ac_res=\$$as_ac_Lib
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
$as_echo "#define HAVE_SCM_NUM2DBL 1" >>confdefs.h
fi
+# end patch
+# end patch
ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile"
--- libmatheval-1.1.11-v/tests/matheval.c.bak 2018-07-13 12:43:21.718862366 +0200
+++ libmatheval-1.1.11/tests/matheval.c 2018-07-13 12:46:34.162597100 +0200
@@ -51,7 +51,7 @@
/* Guile interface for libmatheval library. Procedures below are simple
* wrappers for corresponding libmatheval procedures. */
-static scm_sizet evaluator_destroy_scm(SCM evaluator_smob);
+static size_t evaluator_destroy_scm(SCM evaluator_smob);
static SCM evaluator_create_scm(SCM string);
static SCM evaluator_evaluate_scm(SCM evaluator_smob, SCM count,
SCM names, SCM values);
@@ -122,7 +122,7 @@
}
/* Wrapper for evaluator_destroy() procedure from libmatheval library. */
-static scm_sizet
+static size_t
evaluator_destroy_scm(SCM evaluator_smob)
{
SCM_ASSERT((SCM_NIMP(evaluator_smob)
|
