Package: mit-scheme / 10.1.5-1

0001-allow-autoreconf-force.patch Patch series | download
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
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
From: "Barak A. Pearlmutter" <barak+git@cs.nuim.ie>
Date: Mon, 22 Jul 2013 19:58:13 +0200
Subject: allow autoreconf force

Recombobulate slightly to allow full regeneration via the command
$ autoreconf --force

- move src/microcode/aclocal.m4 to src/microcode/mit_scheme_native_code.m4

- use single shared directory locally-defined macros (src/microcode/ for now)

The necessary local m4 macro file is explicitly included.
This is necessary because autoconf is not using automake or libtools,
so  AC_CONFIG_MACRO_DIR([.../microcode]) won't work.  Gulp.
---
 src/configure.ac                        |   4 ++
 src/microcode/aclocal.m4                | 118 --------------------------------
 src/microcode/configure.ac              |   4 ++
 src/microcode/mit_scheme_native_code.m4 | 118 ++++++++++++++++++++++++++++++++
 4 files changed, 126 insertions(+), 118 deletions(-)
 delete mode 100644 src/microcode/aclocal.m4
 create mode 100644 src/microcode/mit_scheme_native_code.m4

diff --git a/src/configure.ac b/src/configure.ac
index 0fd6d9f..afcf3f0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,6 +3,10 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([MIT/GNU Scheme], [10.1.5], [bug-mit-scheme@gnu.org], [mit-scheme])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_CONFIG_AUX_DIR([microcode])
+# Would set m4 macro dir, but only works if automake or libtools in use.
+# Instead we include directly.
+# AC_CONFIG_MACRO_DIR([microcode])
+m4_include([microcode/mit_scheme_native_code.m4])
 AC_PROG_MAKE_SET
 
 AC_COPYRIGHT(
diff --git a/src/microcode/aclocal.m4 b/src/microcode/aclocal.m4
deleted file mode 100644
index 990eacd..0000000
--- a/src/microcode/aclocal.m4
+++ /dev/null
@@ -1,118 +0,0 @@
-# MIT_SCHEME_NATIVE_CODE(SPEC, HOST_CPU)
-# --------------------------------------
-AC_DEFUN([MIT_SCHEME_NATIVE_CODE],[
-_mit_scheme_native_code_spec=$1
-_mit_scheme_native_code_host_cpu=$2
-
-AC_MSG_CHECKING([for native-code support])
-MIT_SCHEME_ARCHITECTURE([${_mit_scheme_native_code_spec}])
-
-case ${mit_scheme_architecture} in
-yes)
-    case ${_mit_scheme_native_code_host_cpu} in
-    i?86)
-	AC_CHECK_DECL([__x86_64__],
-		      [_mit_scheme_native_code_host_cpu=x86_64],
-		      [_mit_scheme_native_code_host_cpu=i386])
-	;;
-    esac
-    ;;
-esac
-
-case ${mit_scheme_architecture} in
-yes)
-    case ${_mit_scheme_native_code_host_cpu} in
-    i386)
-	mit_scheme_native_code=i386
-	;;
-    x86_64)
-	mit_scheme_native_code=x86-64
-	;;
-    *)
-	AC_MSG_ERROR([unable to determine host architecture])
-	;;
-    esac
-    ;;
-*)
-    mit_scheme_native_code=${mit_scheme_architecture}
-    ;;
-esac
-
-case ${mit_scheme_native_code} in
-none)
-    AC_MSG_RESULT([no])
-    ;;
-c)
-    AC_MSG_RESULT([yes, using portable C code])
-    ;;
-svm1)
-    AC_MSG_RESULT([yes, using portable SVM code])
-    ;;
-*)
-    AC_MSG_RESULT([yes, for ${mit_scheme_native_code}])
-    ;;
-esac
-])
-
-# MIT_SCHEME_COMPILER_TARGET(SPEC)
-# --------------------------------
-AC_DEFUN([MIT_SCHEME_COMPILER_TARGET],[
-_mit_scheme_compiler_target_spec=$1
-
-AC_MSG_CHECKING([for compiler target])
-MIT_SCHEME_ARCHITECTURE([${with_compiler_target}])
-
-case ${mit_scheme_architecture} in
-yes)
-    mit_scheme_compiler_target=${mit_scheme_native_code}
-    ;;
-*)
-    mit_scheme_compiler_target=${mit_scheme_architecture}
-    ;;
-esac
-
-case ${mit_scheme_compiler_target} in
-none)
-    AC_MSG_RESULT([none])
-    ;;
-c)
-    AC_MSG_RESULT([yes, using portable C code])
-    ;;
-svm1)
-    AC_MSG_RESULT([yes, using portable SVM code])
-    ;;
-*)
-    AC_MSG_RESULT([yes, for ${mit_scheme_compiler_target}])
-    ;;
-esac
-])
-
-# MIT_SCHEME_ARCHITECTURE(SPEC)
-# -----------------------------
-AC_DEFUN([MIT_SCHEME_ARCHITECTURE],[
-_mit_scheme_architecture_spec=$1
-
-case ${_mit_scheme_architecture_spec} in
-yes|YES|y|Y)
-    mit_scheme_architecture=yes
-    ;;
-c|C)
-    mit_scheme_architecture=c
-    ;;
-svm|svm1)
-    mit_scheme_architecture=svm1
-    ;;
-no|NO|none|NONE|n|N)
-    mit_scheme_architecture=none
-    ;;
-i?86|x86)
-    mit_scheme_architecture=i386
-    ;;
-x86-64|x86_64|amd64)
-    mit_scheme_architecture=x86-64
-    ;;
-*)
-    AC_MSG_ERROR([unknown compiler architecture: ${_mit_scheme_architecture_spec}])
-    ;;
-esac
-])
diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index 3b95751..5d032d7 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -2,6 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [15.3], [bug-mit-scheme@gnu.org], [mit-scheme])
 AC_CONFIG_SRCDIR([boot.c])
+# Would set m4 macro dir, but only works if automake or libtools in use.
+# Instead we include directly.
+# AC_CONFIG_MACRO_DIR([../microcode])
+m4_include([../microcode/mit_scheme_native_code.m4])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
 
diff --git a/src/microcode/mit_scheme_native_code.m4 b/src/microcode/mit_scheme_native_code.m4
new file mode 100644
index 0000000..990eacd
--- /dev/null
+++ b/src/microcode/mit_scheme_native_code.m4
@@ -0,0 +1,118 @@
+# MIT_SCHEME_NATIVE_CODE(SPEC, HOST_CPU)
+# --------------------------------------
+AC_DEFUN([MIT_SCHEME_NATIVE_CODE],[
+_mit_scheme_native_code_spec=$1
+_mit_scheme_native_code_host_cpu=$2
+
+AC_MSG_CHECKING([for native-code support])
+MIT_SCHEME_ARCHITECTURE([${_mit_scheme_native_code_spec}])
+
+case ${mit_scheme_architecture} in
+yes)
+    case ${_mit_scheme_native_code_host_cpu} in
+    i?86)
+	AC_CHECK_DECL([__x86_64__],
+		      [_mit_scheme_native_code_host_cpu=x86_64],
+		      [_mit_scheme_native_code_host_cpu=i386])
+	;;
+    esac
+    ;;
+esac
+
+case ${mit_scheme_architecture} in
+yes)
+    case ${_mit_scheme_native_code_host_cpu} in
+    i386)
+	mit_scheme_native_code=i386
+	;;
+    x86_64)
+	mit_scheme_native_code=x86-64
+	;;
+    *)
+	AC_MSG_ERROR([unable to determine host architecture])
+	;;
+    esac
+    ;;
+*)
+    mit_scheme_native_code=${mit_scheme_architecture}
+    ;;
+esac
+
+case ${mit_scheme_native_code} in
+none)
+    AC_MSG_RESULT([no])
+    ;;
+c)
+    AC_MSG_RESULT([yes, using portable C code])
+    ;;
+svm1)
+    AC_MSG_RESULT([yes, using portable SVM code])
+    ;;
+*)
+    AC_MSG_RESULT([yes, for ${mit_scheme_native_code}])
+    ;;
+esac
+])
+
+# MIT_SCHEME_COMPILER_TARGET(SPEC)
+# --------------------------------
+AC_DEFUN([MIT_SCHEME_COMPILER_TARGET],[
+_mit_scheme_compiler_target_spec=$1
+
+AC_MSG_CHECKING([for compiler target])
+MIT_SCHEME_ARCHITECTURE([${with_compiler_target}])
+
+case ${mit_scheme_architecture} in
+yes)
+    mit_scheme_compiler_target=${mit_scheme_native_code}
+    ;;
+*)
+    mit_scheme_compiler_target=${mit_scheme_architecture}
+    ;;
+esac
+
+case ${mit_scheme_compiler_target} in
+none)
+    AC_MSG_RESULT([none])
+    ;;
+c)
+    AC_MSG_RESULT([yes, using portable C code])
+    ;;
+svm1)
+    AC_MSG_RESULT([yes, using portable SVM code])
+    ;;
+*)
+    AC_MSG_RESULT([yes, for ${mit_scheme_compiler_target}])
+    ;;
+esac
+])
+
+# MIT_SCHEME_ARCHITECTURE(SPEC)
+# -----------------------------
+AC_DEFUN([MIT_SCHEME_ARCHITECTURE],[
+_mit_scheme_architecture_spec=$1
+
+case ${_mit_scheme_architecture_spec} in
+yes|YES|y|Y)
+    mit_scheme_architecture=yes
+    ;;
+c|C)
+    mit_scheme_architecture=c
+    ;;
+svm|svm1)
+    mit_scheme_architecture=svm1
+    ;;
+no|NO|none|NONE|n|N)
+    mit_scheme_architecture=none
+    ;;
+i?86|x86)
+    mit_scheme_architecture=i386
+    ;;
+x86-64|x86_64|amd64)
+    mit_scheme_architecture=x86-64
+    ;;
+*)
+    AC_MSG_ERROR([unknown compiler architecture: ${_mit_scheme_architecture_spec}])
+    ;;
+esac
+])