]>
Commit | Line | Data |
---|---|---|
36a2f0c1 | 1 | Index: configure |
2 | =================================================================== | |
3 | RCS file: /cvsroot/clisp/clisp/src/configure,v | |
4 | retrieving revision 1.81 | |
5 | retrieving revision 1.82 | |
6 | diff -u -w -b -u -b -w -i -B -r1.81 -r1.82 | |
7 | --- configure 4 Sep 2003 21:33:23 -0000 1.81 | |
8 | +++ configure 5 Sep 2003 14:41:30 -0000 1.82 | |
9 | @@ -14570,26 +14570,6 @@ | |
10 | #endif | |
11 | /* Declare opendir(), closedir(). */ | |
12 | #include <$ac_header_dirent> | |
13 | -extern | |
14 | -#ifdef __cplusplus | |
15 | -"C" | |
16 | -#endif | |
17 | - | |
18 | -#if defined(__STDC__) || defined(__cplusplus) | |
19 | -DIR* opendir (OPENDIR_CONST char* dirname); | |
20 | -#else | |
21 | -DIR* opendir(); | |
22 | -#endif | |
23 | -extern | |
24 | -#ifdef __cplusplus | |
25 | -"C" | |
26 | -#endif | |
27 | - | |
28 | -#if defined(__STDC__) || defined(__cplusplus) | |
29 | -RETCLOSEDIRTYPE closedir (DIR* dirp); | |
30 | -#else | |
31 | -RETCLOSEDIRTYPE closedir(); | |
32 | -#endif | |
33 | int main() { exit(closedir(opendir(".")) != 0); } | |
34 | _ACEOF | |
35 | rm -f conftest$ac_exeext | |
36 | @@ -15526,31 +15506,11 @@ | |
37 | #ifdef NEED_SYS_IOCTL_H | |
38 | #include <sys/ioctl.h> | |
39 | #endif | |
40 | -extern | |
41 | -#ifdef __cplusplus | |
42 | -"C" | |
43 | -#endif | |
44 | - | |
45 | -#if defined(__STDC__) || defined(__cplusplus) | |
46 | -int ioctl ($cl_cv_proto_ioctl_args); | |
47 | -#else | |
48 | -int ioctl(); | |
49 | -#endif | |
50 | /* Declare open(). */ | |
51 | #include <fcntl.h> | |
52 | #ifdef OPEN_NEEDS_SYS_FILE_H | |
53 | #include <sys/file.h> | |
54 | #endif | |
55 | -extern | |
56 | -#ifdef __cplusplus | |
57 | -"C" | |
58 | -#endif | |
59 | - | |
60 | -#if defined(__STDC__) || defined(__cplusplus) | |
61 | -int open ($cl_cv_proto_open_args); | |
62 | -#else | |
63 | -int open(); | |
64 | -#endif | |
65 | int main () | |
66 | { int fd = open("conftest.c",O_RDONLY,0644); | |
67 | long x; | |
68 | @@ -17783,18 +17743,6 @@ | |
69 | #ifdef HAVE_UNISTD_H | |
70 | #include <unistd.h> | |
71 | #endif | |
72 | -#ifndef malloc | |
73 | -extern | |
74 | -#ifdef __cplusplus | |
75 | -"C" | |
76 | -#endif | |
77 | - | |
78 | -#if defined(__STDC__) || defined(__cplusplus) | |
79 | -RETMALLOCTYPE malloc (MALLOC_SIZE_T size); | |
80 | -#else | |
81 | -RETMALLOCTYPE malloc(); | |
82 | -#endif | |
83 | -#endif | |
84 | $address_range_prog | |
85 | int main() { printf_address(chop_address(malloc(10000))); exit(0); } | |
86 | EOF | |
87 | @@ -19250,44 +19198,11 @@ | |
88 | #ifdef HAVE_UNISTD_H | |
89 | #include <unistd.h> | |
90 | #endif | |
91 | -#ifndef malloc | |
92 | -extern | |
93 | -#ifdef __cplusplus | |
94 | -"C" | |
95 | -#endif | |
96 | - | |
97 | -#if defined(__STDC__) || defined(__cplusplus) | |
98 | -RETMALLOCTYPE malloc (MALLOC_SIZE_T size); | |
99 | -#else | |
100 | -RETMALLOCTYPE malloc(); | |
101 | -#endif | |
102 | -#endif | |
103 | /* declare getpagesize() and mprotect() */ | |
104 | #include <sys/mman.h> | |
105 | #ifndef HAVE_GETPAGESIZE | |
106 | #include <sys/param.h> | |
107 | #define getpagesize() PAGESIZE | |
108 | -#else | |
109 | -extern | |
110 | -#ifdef __cplusplus | |
111 | -"C" | |
112 | -#endif | |
113 | - | |
114 | -#if defined(__STDC__) || defined(__cplusplus) | |
115 | -RETGETPAGESIZETYPE getpagesize (void); | |
116 | -#else | |
117 | -RETGETPAGESIZETYPE getpagesize(); | |
118 | -#endif | |
119 | -#endif | |
120 | -extern | |
121 | -#ifdef __cplusplus | |
122 | -"C" | |
123 | -#endif | |
124 | - | |
125 | -#if defined(__STDC__) || defined(__cplusplus) | |
126 | -int mprotect (MPROTECT_CONST MMAP_ADDR_T addr, MMAP_SIZE_T len, int prot); | |
127 | -#else | |
128 | -int mprotect(); | |
129 | #endif | |
130 | char foo; | |
131 | int main () { | |
132 | @@ -19516,16 +19431,12 @@ | |
133 | fi | |
134 | ||
135 | if test "$ac_cv_header_sys_shm_h" = yes -a "$ac_cv_header_sys_ipc_h" = yes; then | |
136 | -# This test is from Marcus Daniels | |
137 | -echo "$as_me:$LINENO: checking for working shared memory" >&5 | |
138 | -echo $ECHO_N "checking for working shared memory... $ECHO_C" >&6 | |
139 | -if test "${cl_cv_sys_shm_works+set}" = set; then | |
140 | +echo "$as_me:$LINENO: checking for shmat declaration" >&5 | |
141 | +echo $ECHO_N "checking for shmat declaration... $ECHO_C" >&6 | |
142 | +if test "${cl_cv_proto_shmat+set}" = set; then | |
143 | echo $ECHO_N "(cached) $ECHO_C" >&6 | |
144 | else | |
145 | ||
146 | -if test "$cross_compiling" = yes; then | |
147 | - cl_cv_sys_shm_works="guessing no" | |
148 | -else | |
149 | cat >conftest.$ac_ext <<_ACEOF | |
150 | #line $LINENO "configure" | |
151 | /* confdefs.h. */ | |
152 | @@ -19533,6 +19444,11 @@ | |
153 | cat confdefs.h >>conftest.$ac_ext | |
154 | cat >>conftest.$ac_ext <<_ACEOF | |
155 | /* end confdefs.h. */ | |
156 | + | |
157 | +#include <stdlib.h> | |
158 | +#ifdef HAVE_UNISTD_H | |
159 | +#include <unistd.h> | |
160 | +#endif | |
161 | #include <sys/types.h> | |
162 | #include <sys/ipc.h> | |
163 | #include <sys/shm.h> | |
164 | @@ -19542,40 +19459,146 @@ | |
165 | #endif | |
166 | ||
167 | #if defined(__STDC__) || defined(__cplusplus) | |
168 | -int shmget (key_t key, $cl_cv_proto_shmget_arg2 size, int shmflg); | |
169 | -#else | |
170 | -int shmget(); | |
171 | -#endif | |
172 | -extern | |
173 | + | |
174 | #ifdef __cplusplus | |
175 | -"C" | |
176 | +void* shmat(int, const void *, int); | |
177 | +#else | |
178 | +void* shmat(); | |
179 | #endif | |
180 | ||
181 | -#if defined(__STDC__) || defined(__cplusplus) | |
182 | -$cl_cv_proto_shmat_ret shmat (int shmid, $cl_cv_proto_shmat_arg2 $cl_cv_proto_shmat_ret shmaddr, int shmflg); | |
183 | #else | |
184 | -$cl_cv_proto_shmat_ret shmat(); | |
185 | -#endif | |
186 | -extern | |
187 | -#ifdef __cplusplus | |
188 | -"C" | |
189 | +void* shmat(); | |
190 | #endif | |
191 | ||
192 | -#if defined(__STDC__) || defined(__cplusplus) | |
193 | -int shmdt ($cl_cv_proto_shmdt_arg1 shmaddr); | |
194 | -#else | |
195 | -int shmdt(); | |
196 | +int | |
197 | +main () | |
198 | +{ | |
199 | + | |
200 | + ; | |
201 | + return 0; | |
202 | +} | |
203 | +_ACEOF | |
204 | +rm -f conftest.$ac_objext | |
205 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
206 | + (eval $ac_compile) 2>&5 | |
207 | + ac_status=$? | |
208 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
209 | + (exit $ac_status); } && | |
210 | + { ac_try='test -s conftest.$ac_objext' | |
211 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
212 | + (eval $ac_try) 2>&5 | |
213 | + ac_status=$? | |
214 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
215 | + (exit $ac_status); }; }; then | |
216 | + cl_cv_proto_shmat_ret="void*" | |
217 | +else | |
218 | + echo "$as_me: failed program was:" >&5 | |
219 | +sed 's/^/| /' conftest.$ac_ext >&5 | |
220 | + | |
221 | +cl_cv_proto_shmat_ret="char*" | |
222 | +fi | |
223 | +rm -f conftest.$ac_objext conftest.$ac_ext | |
224 | + | |
225 | +cat >conftest.$ac_ext <<_ACEOF | |
226 | +#line $LINENO "configure" | |
227 | +/* confdefs.h. */ | |
228 | +_ACEOF | |
229 | +cat confdefs.h >>conftest.$ac_ext | |
230 | +cat >>conftest.$ac_ext <<_ACEOF | |
231 | +/* end confdefs.h. */ | |
232 | + | |
233 | +#include <stdlib.h> | |
234 | +#ifdef HAVE_UNISTD_H | |
235 | +#include <unistd.h> | |
236 | #endif | |
237 | +#include <sys/types.h> | |
238 | +#include <sys/ipc.h> | |
239 | +#include <sys/shm.h> | |
240 | + | |
241 | extern | |
242 | #ifdef __cplusplus | |
243 | "C" | |
244 | #endif | |
245 | ||
246 | #if defined(__STDC__) || defined(__cplusplus) | |
247 | -int shmctl ($cl_cv_proto_shmctl_args); | |
248 | +$cl_cv_proto_shmat_ret shmat (int shmid, $cl_cv_proto_shmat_ret shmaddr, int shmflg); | |
249 | #else | |
250 | -int shmctl(); | |
251 | +$cl_cv_proto_shmat_ret shmat(); | |
252 | #endif | |
253 | + | |
254 | +int | |
255 | +main () | |
256 | +{ | |
257 | + | |
258 | + ; | |
259 | + return 0; | |
260 | +} | |
261 | +_ACEOF | |
262 | +rm -f conftest.$ac_objext | |
263 | +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
264 | + (eval $ac_compile) 2>&5 | |
265 | + ac_status=$? | |
266 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
267 | + (exit $ac_status); } && | |
268 | + { ac_try='test -s conftest.$ac_objext' | |
269 | + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
270 | + (eval $ac_try) 2>&5 | |
271 | + ac_status=$? | |
272 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
273 | + (exit $ac_status); }; }; then | |
274 | + cl_cv_proto_shmat_arg2="" | |
275 | +else | |
276 | + echo "$as_me: failed program was:" >&5 | |
277 | +sed 's/^/| /' conftest.$ac_ext >&5 | |
278 | + | |
279 | +cl_cv_proto_shmat_arg2="const" | |
280 | +fi | |
281 | +rm -f conftest.$ac_objext conftest.$ac_ext | |
282 | + | |
283 | + | |
284 | + | |
285 | +cl_cv_proto_shmat="extern $cl_cv_proto_shmat_ret shmat (int, $cl_cv_proto_shmat_arg2 $cl_cv_proto_shmat_ret, int);" | |
286 | +fi | |
287 | + | |
288 | +cl_cv_proto_shmat=`echo "$cl_cv_proto_shmat" | tr -s ' ' | sed -e 's/( /(/'` | |
289 | +echo "$as_me:$LINENO: result: ${ac_t:- | |
290 | + }$cl_cv_proto_shmat" >&5 | |
291 | +echo "${ECHO_T}${ac_t:- | |
292 | + }$cl_cv_proto_shmat" >&6 | |
293 | + | |
294 | + | |
295 | +cat >>confdefs.h <<_ACEOF | |
296 | +#define RETSHMATTYPE $cl_cv_proto_shmat_ret | |
297 | +_ACEOF | |
298 | + | |
299 | + | |
300 | +cat >>confdefs.h <<_ACEOF | |
301 | +#define SHMAT_CONST $cl_cv_proto_shmat_arg2 | |
302 | +_ACEOF | |
303 | + | |
304 | +fi | |
305 | + | |
306 | +if test "$ac_cv_header_sys_shm_h" = yes -a "$ac_cv_header_sys_ipc_h" = yes; then | |
307 | +# This test is from Marcus Daniels | |
308 | +echo "$as_me:$LINENO: checking for working shared memory" >&5 | |
309 | +echo $ECHO_N "checking for working shared memory... $ECHO_C" >&6 | |
310 | +if test "${cl_cv_sys_shm_works+set}" = set; then | |
311 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
312 | +else | |
313 | + | |
314 | +if test "$cross_compiling" = yes; then | |
315 | + cl_cv_sys_shm_works="guessing no" | |
316 | +else | |
317 | + cat >conftest.$ac_ext <<_ACEOF | |
318 | +#line $LINENO "configure" | |
319 | +/* confdefs.h. */ | |
320 | +_ACEOF | |
321 | +cat confdefs.h >>conftest.$ac_ext | |
322 | +cat >>conftest.$ac_ext <<_ACEOF | |
323 | +/* end confdefs.h. */ | |
324 | +#include <sys/types.h> | |
325 | +#include <sys/ipc.h> | |
326 | +#include <sys/shm.h> | |
327 | /* try attaching a single segment to multiple addresses */ | |
328 | #define segsize 0x10000 | |
329 | #define attaches 128 | |
330 | @@ -19799,32 +19822,6 @@ | |
331 | #ifdef HAVE_SYS_SYSMACROS_H | |
332 | #include <sys/sysmacros.h> | |
333 | #endif | |
334 | -#if defined(__STDC__) || defined(__cplusplus) | |
335 | -extern | |
336 | -#ifdef __cplusplus | |
337 | -"C" | |
338 | -#endif | |
339 | -int shmget (key_t key, SHMGET_SIZE_T size, int shmflg); | |
340 | -extern | |
341 | -#ifdef __cplusplus | |
342 | -"C" | |
343 | -#endif | |
344 | -RETSHMATTYPE shmat (int shmid, SHMAT_CONST RETSHMATTYPE shmaddr, int shmflg); | |
345 | -extern | |
346 | -#ifdef __cplusplus | |
347 | -"C" | |
348 | -#endif | |
349 | - | |
350 | -#ifdef SHMCTL_DOTS | |
351 | -int shmctl (int shmid, int cmd, ...); | |
352 | -#else | |
353 | -int shmctl (int shmid, int cmd, struct shmid_ds * buf); | |
354 | -#endif | |
355 | -#else | |
356 | -extern int shmget(); | |
357 | -extern RETSHMATTYPE shmat(); | |
358 | -extern int shmctl(); | |
359 | -#endif | |
360 | int main () | |
361 | { unsigned int pagesize = 8192; /* should be a multiple of SHMLBA */ | |
362 | unsigned long addr = (unsigned long) malloc(2*pagesize); | |
363 | @@ -21214,37 +21211,17 @@ | |
364 | #include "confdefs.h" | |
365 | #include <sys/types.h> | |
366 | #include <stdlib.h> | |
367 | +/* Declare chdir(). */ | |
368 | #ifdef HAVE_UNISTD_H | |
369 | #include <unistd.h> | |
370 | #endif | |
371 | #include <string.h> | |
372 | #include <stdio.h> | |
373 | -/* Declare chdir(). */ | |
374 | -extern | |
375 | -#ifdef __cplusplus | |
376 | -"C" | |
377 | -#endif | |
378 | - | |
379 | -#if defined(__STDC__) || defined(__cplusplus) | |
380 | -int chdir (CHDIR_CONST char* path); | |
381 | -#else | |
382 | -int chdir(); | |
383 | -#endif | |
384 | /* Declare open(). */ | |
385 | #include <fcntl.h> | |
386 | #ifdef OPEN_NEEDS_SYS_FILE_H | |
387 | #include <sys/file.h> | |
388 | #endif | |
389 | -extern | |
390 | -#ifdef __cplusplus | |
391 | -"C" | |
392 | -#endif | |
393 | - | |
394 | -#if defined(__STDC__) || defined(__cplusplus) | |
395 | -int open ($cl_cv_proto_open_args); | |
396 | -#else | |
397 | -int open(); | |
398 | -#endif | |
399 | /* Declare opendir(), readdir(), closedir(). */ | |
400 | #include <$ac_header_dirent> | |
401 | #ifdef DIRENT | |
402 | @@ -21252,36 +21229,6 @@ | |
403 | #else | |
404 | #define SDIRENT struct direct | |
405 | #endif | |
406 | -extern | |
407 | -#ifdef __cplusplus | |
408 | -"C" | |
409 | -#endif | |
410 | - | |
411 | -#if defined(__STDC__) || defined(__cplusplus) | |
412 | -DIR* opendir (OPENDIR_CONST char* dirname); | |
413 | -#else | |
414 | -DIR* opendir(); | |
415 | -#endif | |
416 | -extern | |
417 | -#ifdef __cplusplus | |
418 | -"C" | |
419 | -#endif | |
420 | - | |
421 | -#if defined(__STDC__) || defined(__cplusplus) | |
422 | -SDIRENT* readdir (DIR* dirp); | |
423 | -#else | |
424 | -SDIRENT* readdir(); | |
425 | -#endif | |
426 | -extern | |
427 | -#ifdef __cplusplus | |
428 | -"C" | |
429 | -#endif | |
430 | - | |
431 | -#if defined(__STDC__) || defined(__cplusplus) | |
432 | -RETCLOSEDIRTYPE closedir (DIR* dirp); | |
433 | -#else | |
434 | -RETCLOSEDIRTYPE closedir(); | |
435 | -#endif | |
436 | /* A small program which checks for each character whether or not it is | |
437 | * valid in filenames. */ | |
438 | #define N 256 | |
439 | @@ -21397,7 +21344,7 @@ | |
440 | echo "${ECHO_T}$cl_cv_os_valid_filename_charset" >&6 | |
441 | if test -n "$cl_cv_os_valid_filename_char"; then | |
442 | ||
443 | -cat >>confdefs.h <<\_ACEOF | |
444 | +cat >>confdefs.h <<_ACEOF | |
445 | #define VALID_FILENAME_CHAR $cl_cv_os_valid_filename_char | |
446 | _ACEOF | |
447 | ||
448 |