ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/configure.in

Comparing BasiliskII/src/Unix/configure.in (file contents):
Revision 1.35 by gbeauche, 2001-03-20T18:05:35Z vs.
Revision 1.61 by cebix, 2002-07-31T16:46:14Z

#	Line 1 | Line 1
1		dnl Process this file with autoconf to produce a configure script.
2	<	dnl Written in 1999 by Christian Bauer et al.
2	>	dnl Written in 2002 by Christian Bauer et al.
3
4		AC_INIT(main_unix.cpp)
5		AC_PREREQ(2.12)
#	Line 9 | Line 9 | dnl Options.
9		AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
10		AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
11		AC_ARG_ENABLE(fbdev-dga,     [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
12	<	AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
12	>	AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
13
14		dnl FPU emulation core.
15		AC_ARG_ENABLE(fpe,
#	Line 52 | Line 52 | case "$target_os" in
52		netbsd*)      OS_TYPE=netbsd;;
53		freebsd*)     OS_TYPE=freebsd;;
54		solaris*)     OS_TYPE=solaris;;
55	<	*)            OS_TYPE=`echo $target_os | sed -e 's/-/_/' | sed -e 's/\./_/'`;;
55	>	darwin*)      OS_TYPE=darwin;;
56	>	*)            OS_TYPE=`echo $target_os | sed -e 's/-/_/g' | sed -e 's/\./_/g'`;;
57		esac
58		DEFINES="$DEFINES -DOS_$OS_TYPE"
59
#	Line 66 | Line 67 | case "$target_cpu" in
67		m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
68		sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
69		powerpc* ) CPU_TYPE=powerpc HAVE_POWERPC=yes;;
70	<	*) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
70	>	*) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/g'`;;
71		esac
72		DEFINES="$DEFINES -DCPU_$CPU_TYPE"
73
#	Line 86 | Line 87 | if [[ "x$WANT_MON" = "xyes" ]]; then
87		if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
88		AC_MSG_RESULT(yes)
89		AC_DEFINE(ENABLE_MON)
90	<	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
90	>	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
91		CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
92	+	AC_CHECK_LIB(ncurses, tgetent, ,
93	+	AC_CHECK_LIB(termcap, tgetent, ,
94	+	AC_CHECK_LIB(termlib, tgetent, ,
95	+	AC_CHECK_LIB(terminfo, tgetent, ,
96	+	AC_CHECK_LIB(Hcurses, tgetent, ,
97	+	AC_CHECK_LIB(curses, tgetent))))))
98		AC_CHECK_LIB(readline, readline)
92	–	AC_CHECK_LIB(termcap, tputs)
99		AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
100		else
101		AC_MSG_RESULT(no)
#	Line 100 | Line 106 | fi
106
107		dnl Checks for libraries.
108		AC_CHECK_LIB(posix4, sem_init)
109	+	AC_CHECK_LIB(rt, timer_create)
110
111		dnl We need X11.
112		AC_PATH_XTRA
#	Line 123 | Line 130 | if [[ "x$HAVE_PTHREADS" = "xyes" ]]; the
130		AC_DEFINE(HAVE_PTHREADS)
131		fi
132		AC_CHECK_FUNCS(pthread_cancel)
133	+	AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
134	+	AC_CHECK_FUNCS(pthread_mutexattr_settype)
135
136		dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
137		SEMSRC=
#	Line 166 | Line 175 | UISRCS=../dummy/prefs_editor_dummy.cpp
175		if [[ "x$WANT_GTK" = "xyes" ]]; then
176		AM_PATH_GTK(1.2.0, [
177		AC_DEFINE(ENABLE_GTK)
169	–	CFLAGS="$CFLAGS $GTK_CFLAGS"
178		CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
179		LIBS="$LIBS $GTK_LIBS"
180		UISRCS=prefs_editor_gtk.cpp
181	+	B2_PATH_GNOMEUI([
182	+	AC_DEFINE(HAVE_GNOMEUI)
183	+	CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
184	+	LIBS="$LIBS $GNOMEUI_LIBS"
185	+	], [])
186		], [
187		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
188		WANT_GTK=no
#	Line 189 | Line 202 | if [[ "x$WANT_ESD" = "xyes" ]]; then
202		])
203		fi
204
205	+	dnl We use 64-bit file size support if possible.
206	+	dnl FIXME: Use AC_SYS_LARGEFILE from autoconf 2.5+
207	+	if [[ "x$OS_TYPE" = "xlinux" ]]; then
208	+	AC_DEFINE(_USE_LARGEFILE_SOURCE, 1, [Get more functions for correct standard I/O])
209	+	AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support])
210	+	fi
211	+
212		dnl Checks for header files.
213		AC_HEADER_STDC
214	<	AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h)
214	>	AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h sys/mman.h)
215
216		dnl Checks for typedefs, structures, and compiler characteristics.
217		AC_C_BIGENDIAN
#	Line 204 | Line 224 | AC_CHECK_SIZEOF(long long, 8)
224		AC_CHECK_SIZEOF(void *, 4)
225		AC_TYPE_OFF_T
226		AC_CHECK_TYPE(loff_t, off_t)
227	+	AC_CHECK_TYPE(caddr_t, [char *])
228		AC_TYPE_SIZE_T
229		AC_TYPE_SIGNAL
230		AC_HEADER_TIME
231		AC_STRUCT_TM
232
233	+	dnl Check whether sys/socket.h defines type socklen_t.
234	+	dnl (extracted from ac-archive/Miscellaneous)
235	+	AC_CACHE_CHECK("for socklen_t",
236	+	ac_cv_type_socklen_t, [
237	+	AC_TRY_COMPILE([
238	+	#include <sys/types.h>
239	+	#include <sys/socket.h>
240	+	], [socklen_t len = 42; return 0;],
241	+	ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
242	+	dnl When cross-compiling, do not assume anything.
243	+	ac_cv_type_socklen_t="guessing no"
244	+	)
245	+	])
246	+	if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
247	+	AC_DEFINE(socklen_t, int)
248	+	fi
249	+
250		dnl Checks for library functions.
251		AC_CHECK_FUNCS(strdup cfmakeraw)
252		AC_CHECK_FUNCS(clock_gettime timer_create)
253	+	AC_CHECK_FUNCS(sigaction signal)
254	+	AC_CHECK_FUNCS(mmap mprotect munmap)
255	+	AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
256	+
257	+	dnl Darwin seems to define mach_task_self() instead of task_self().
258	+	AC_CHECK_FUNCS(mach_task_self task_self)
259	+
260	+	dnl Check for headers and functions related to pty support (sshpty.c)
261	+	dnl From openssh-3.2.2p1 configure.ac
262	+
263	+	AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
264	+	AC_CHECK_FUNCS(_getpty vhangup strlcpy)
265	+
266	+	case "$host" in
267	+	*-*-hpux10.26)
268	+	disable_ptmx_check=yes
269	+	;;
270	+	*-*-linux*)
271	+	no_dev_ptmx=1
272	+	;;
273	+	mips-sony-bsd|mips-sony-newsos4)
274	+	AC_DEFINE(HAVE_NEWS4)
275	+	;;
276	+	*-*-sco3.2v4*)
277	+	no_dev_ptmx=1
278	+	;;
279	+	*-*-sco3.2v5*)
280	+	no_dev_ptmx=1
281	+	;;
282	+	esac
283	+
284	+	if test -z "$no_dev_ptmx" ; then
285	+	if test "x$disable_ptmx_check" != "xyes" ; then
286	+	AC_CHECK_FILE("/dev/ptmx",
287	+	[
288	+	AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)
289	+	have_dev_ptmx=1
290	+	]
291	+	)
292	+	fi
293	+	fi
294	+	AC_CHECK_FILE("/dev/ptc",
295	+	[
296	+	AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)
297	+	have_dev_ptc=1
298	+	]
299	+	)
300	+
301	+	dnl (end of code from openssh-3.2.2p1 configure.ac)
302	+
303
304		dnl Select system-dependant source files.
305		SERIALSRC=serial_unix.cpp
#	Line 222 | Line 310 | EXTRASYSSRCS=
310		CAN_NATIVE_M68K=no
311		case "$target_os" in
312		linux*)
313	<	ETHERSRC=Linux/ether_linux.cpp
226	<	SCSISRC=Linux/scsi_linux.cpp
313	>	ETHERSRC=ether_unix.cpp
314		AUDIOSRC=audio_oss_esd.cpp
315	+	SCSISRC=Linux/scsi_linux.cpp
316		;;
317	<	freebsd*3.*)
317	>	freebsd*)
318	>	ETHERSRC=ether_unix.cpp
319		AUDIOSRC=audio_oss_esd.cpp
320		DEFINES="$DEFINES -DBSD_COMP"
321	+	CXXFLAGS="$CXXFLAGS -fpermissive"
322		dnl Check for the CAM library
323		AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
324		if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
325		AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
326		else
327		dnl Check for the sys kernel includes
328	<	AC_CHECK_HEADER(/sys/cam/cam.h)
329	<	if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
328	>	AC_CHECK_HEADER(camlib.h)
329	>	if [[ "x$ac_cv_header_camlib_h" = "xno" ]]; then
330		dnl In this case I should fix this thing including a "patch"
331		dnl to access directly to the functions in the kernel :) --Orlando
332	<	AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
332	>	AC_MSG_WARN([Cannot find includes for CAM library, disabling SCSI support.])
333		else
334		SCSISRC=FreeBSD/scsi_freebsd.cpp
245	–	CXXFLAGS="$CXXFLAGS -I/sys"
246	–	CFLAGS="$CFLAGS -I/sys"
335		LIBS="$LIBS -lcam"
336		DEFINES="$DEFINES -DCAM"
337		fi
338		fi
339		;;
252	–	freebsd*)
253	–	DEFINES="$DEFINES -DBSD_COMP"
254	–	dnl Check for the SCSI library
255	–	AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
256	–	if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
257	–	AC_MSG_WARN([Cannot find libscsi for SCSI management, disabling SCSI support.])
258	–	else
259	–	dnl Check for the sys kernel includes
260	–	AC_CHECK_HEADER(scsi.h sys/scsiio.h)
261	–	if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
262	–	AC_MSG_WARN([Cannot find includes for the SCSI library, disabling SCSI support.])
263	–	else
264	–	SCSISRC=FreeBSD/scsi_freebsd.cpp
265	–	LIBS="$LIBS -lscsi"
266	–	fi
267	–	fi
268	–	;;
340		netbsd*)
341		CAN_NATIVE_M68K=yes
342		;;
#	Line 274 | Line 345 | solaris*)
345		DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
346		;;
347		irix*)
348	+	ETHERSRC=ether_unix.cpp
349		AUDIOSRC=Irix/audio_irix.cpp
350		EXTRASYSSRCS=Irix/unaligned.c
351		dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
352		DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
353		LIBS="$LIBS -laudio"
354	+	WANT_ESD=no
355	+
356	+	dnl Check if our compiler supports -Ofast (MIPSPro)
357	+	HAVE_OFAST=no
358	+	ocflags="$CFLAGS"
359	+	CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
360	+	AC_MSG_CHECKING(if "-Ofast" works)
361	+	dnl Do a test compile of an empty function
362	+	AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_OFAST=yes], AC_MSG_RESULT(no))
363	+	CFLAGS="$ocflags"
364	+
365		;;
366		esac
367
#	Line 303 | Line 386 | dnl to be put into the config.h file
386		dnl $1 -- the macro to define
387		dnl $2 -- the value to translate
388		AC_DEFUN(AC_TRANSLATE_DEFINE, [
389	<	if [[ "x$2" = "xyes" ]]; then
389	>	if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
390		AC_DEFINE($1)
391		fi
392		])
393
394	+	dnl Various checks if the system supports vm_allocate() and the like functions.
395	+	have_mach_vm=no
396	+	if [[ "x$ac_cv_func_vm_allocate" = "xyes" -a "x$ac_cv_func_vm_deallocate" = "xyes" -a \
397	+	"x$ac_cv_func_vm_protect" = "xyes" ]]; then
398	+	have_mach_vm=yes
399	+	fi
400	+	AC_TRANSLATE_DEFINE(HAVE_MACH_VM, "$have_mach_vm")
401	+
402	+	dnl Check that vm_allocate(), vm_protect() work
403	+	if [[ "x$have_mach_vm" = "xyes" ]]; then
404	+
405	+	AC_CACHE_CHECK("whether vm_protect works",
406	+	ac_cv_vm_protect_works, [
407	+	AC_LANG_SAVE
408	+	AC_LANG_CPLUSPLUS
409	+	ac_cv_vm_protect_works=yes
410	+	dnl First the tests that should segfault
411	+	for test_def in NONE_READ NONE_WRITE READ_WRITE; do
412	+	AC_TRY_RUN([
413	+	#define CONFIGURE_TEST_VM_MAP
414	+	#define TEST_VM_PROT_$test_def
415	+	#include "vm_alloc.cpp"
416	+	], ac_cv_vm_protect_works=no, rm -f core,
417	+	dnl When cross-compiling, do not assume anything
418	+	ac_cv_vm_protect_works="guessing no"
419	+	)
420	+	done
421	+	AC_TRY_RUN([
422	+	#define CONFIGURE_TEST_VM_MAP
423	+	#define TEST_VM_PROT_RDWR_WRITE
424	+	#include "vm_alloc.cpp"
425	+	], , ac_cv_vm_protect_works=no,
426	+	dnl When cross-compiling, do not assume anything
427	+	ac_cv_vm_protect_works="guessing no"
428	+	)
429	+	AC_LANG_RESTORE
430	+	]
431	+	)
432	+
433	+	dnl Remove support for vm_allocate() if vm_protect() does not work
434	+	if [[ "x$have_mach_vm" = "xyes" ]]; then
435	+	case $ac_cv_vm_protect_works in
436	+	*yes) have_mach_vm=yes;;
437	+	*no) have_mach_vm=no;;
438	+	esac
439	+	fi
440	+	AC_TRANSLATE_DEFINE(HAVE_MACH_VM, "$have_mach_vm")
441	+
442	+	fi dnl HAVE_MACH_VM
443	+
444	+	dnl Various checks if the system supports mmap() and the like functions.
445	+	dnl ... and Mach memory allocators are not supported
446	+	have_mmap_vm=no
447	+	if [[ "x$ac_cv_func_mmap" = "xyes" -a "x$ac_cv_func_munmap" = "xyes" -a \
448	+	"x$ac_cv_func_mprotect" = "xyes" ]]; then
449	+	if [[ "x$have_mach_vm" = "xno" ]]; then
450	+	have_mmap_vm=yes
451	+	fi
452	+	fi
453	+	AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, "$have_mmap_vm")
454	+
455	+	dnl Check that mmap() and associated functions work.
456	+	if [[ "x$have_mmap_vm" = "xyes" ]]; then
457	+
458	+	dnl Check if we have a working anonymous mmap()
459	+	AC_CACHE_CHECK("whether mmap supports MAP_ANON",
460	+	ac_cv_mmap_anon, [
461	+	AC_LANG_SAVE
462	+	AC_LANG_CPLUSPLUS
463	+	AC_TRY_RUN([
464	+	#define HAVE_MMAP_ANON
465	+	#define CONFIGURE_TEST_VM_MAP
466	+	#define TEST_VM_MMAP_ANON
467	+	#include "vm_alloc.cpp"
468	+	], ac_cv_mmap_anon=yes, ac_cv_mmap_anon=no,
469	+	dnl When cross-compiling, do not assume anything.
470	+	ac_cv_mmap_anon="guessing no"
471	+	)
472	+	AC_LANG_RESTORE
473	+	]
474	+	)
475	+	AC_TRANSLATE_DEFINE(HAVE_MMAP_ANON, "$ac_cv_mmap_anon")
476	+
477	+	AC_CACHE_CHECK("whether mmap supports MAP_ANONYMOUS",
478	+	ac_cv_mmap_anonymous, [
479	+	AC_LANG_SAVE
480	+	AC_LANG_CPLUSPLUS
481	+	AC_TRY_RUN([
482	+	#define HAVE_MMAP_ANONYMOUS
483	+	#define CONFIGURE_TEST_VM_MAP
484	+	#define TEST_VM_MMAP_ANON
485	+	#include "vm_alloc.cpp"
486	+	], ac_cv_mmap_anonymous=yes, ac_cv_mmap_anonymous=no,
487	+	dnl When cross-compiling, do not assume anything.
488	+	ac_cv_mmap_anonymous="guessing no"
489	+	)
490	+	AC_LANG_RESTORE
491	+	]
492	+	)
493	+	AC_TRANSLATE_DEFINE(HAVE_MMAP_ANONYMOUS, "$ac_cv_mmap_anonymous")
494	+
495	+	AC_CACHE_CHECK("whether mprotect works",
496	+	ac_cv_mprotect_works, [
497	+	AC_LANG_SAVE
498	+	AC_LANG_CPLUSPLUS
499	+	ac_cv_mprotect_works=yes
500	+	dnl First the tests that should segfault
501	+	for test_def in NONE_READ NONE_WRITE READ_WRITE; do
502	+	AC_TRY_RUN([
503	+	#define CONFIGURE_TEST_VM_MAP
504	+	#define TEST_VM_PROT_$test_def
505	+	#include "vm_alloc.cpp"
506	+	], ac_cv_mprotect_works=no, rm -f core,
507	+	dnl When cross-compiling, do not assume anything
508	+	ac_cv_mprotect_works="guessing no"
509	+	)
510	+	done
511	+	AC_TRY_RUN([
512	+	#define CONFIGURE_TEST_VM_MAP
513	+	#define TEST_VM_PROT_RDWR_WRITE
514	+	#include "vm_alloc.cpp"
515	+	], , ac_cv_mprotect_works=no,
516	+	dnl When cross-compiling, do not assume anything
517	+	ac_cv_mprotect_works="guessing no"
518	+	)
519	+	AC_LANG_RESTORE
520	+	]
521	+	)
522	+
523	+	dnl Remove support for mmap() if mprotect() does not work
524	+	if [[ "x$have_mmap_vm" = "xyes" ]]; then
525	+	case $ac_cv_mprotect_works in
526	+	*yes) have_mmap_vm=yes;;
527	+	*no) have_mmap_vm=no;;
528	+	esac
529	+	fi
530	+	AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, $have_mmap_vm)
531	+
532	+	fi dnl HAVE_MMAP_VM
533	+
534		dnl Check if we can mmap 0x2000 bytes from 0x0000
535		AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
536		ac_cv_can_map_lm, [
537		AC_LANG_SAVE
538		AC_LANG_CPLUSPLUS
539		AC_TRY_RUN([
540	<	#include <unistd.h>
541	<	#include <fcntl.h>
542	<	#include <sys/mman.h>
543	<
544	<	int main()
545	<	{ int zero_fd; char * lm;
546	<	if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
547	<	if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
325	<	lm[0] = 0x12;
326	<	munmap(lm, 0x2000);
327	<	close(zero_fd);
328	<	exit(0);
540	>	#include "vm_alloc.cpp"
541	>	int main(void) { /* returns 0 if we could map the lowmem globals */
542	>	volatile char * lm;
543	>	if (vm_init() < 0) exit(1);
544	>	if ((lm = (volatile char *)vm_acquire_fixed(0, 0x2000)) == VM_MAP_FAILED) exit(1);
545	>	lm[0] = 'z';
546	>	if (vm_release((char *)lm, 0x2000) < 0) exit(1);
547	>	vm_exit(); exit(0);
548		}
549	<	],
550	<	[ac_cv_can_map_lm=yes],
551	<	[ac_cv_can_map_lm=no]
549	>	], ac_cv_can_map_lm=yes, ac_cv_can_map_lm=no,
550	>	dnl When cross-compiling, do not assume anything.
551	>	ac_cv_can_map_lm="guessing no"
552		)
553		AC_LANG_RESTORE
554		]
555		)
556
557	<	dnl Check if extended signals are supported.
558	<	AC_CACHE_CHECK("whether your system supports extended signal handlers",
559	<	ac_cv_have_extended_signals, [
557	>	dnl Check signal handlers need to be reinstalled
558	>	AC_CACHE_CHECK("whether signal handlers need to be reinstalled",
559	>	ac_cv_signal_need_reinstall, [
560		AC_LANG_SAVE
561		AC_LANG_CPLUSPLUS
562		AC_TRY_RUN([
344	–	#include <unistd.h>
563		#include <stdlib.h>
564	+	#ifdef HAVE_UNISTD_H
565	+	#include <unistd.h>
566	+	#endif
567		#include <signal.h>
568	<	#include <fcntl.h>
569	<	#include <sys/mman.h>
570	<
571	<	static volatile caddr_t mem = 0;
572	<	static int zero_fd = -1;
568	>	static int handled_signal = 0;
569	>	RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
570	>	int main(void) { /* returns 0 if signals need not to be reinstalled */
571	>	signal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
572	>	exit(handled_signal == 2);
573	>	}
574	>	], ac_cv_signal_need_reinstall=yes, ac_cv_signal_need_reinstall=no,
575	>	dnl When cross-compiling, do not assume anything.
576	>	ac_cv_signal_need_reinstall="guessing yes"
577	>	)
578	>	AC_LANG_RESTORE
579	>	]
580	>	)
581	>	AC_TRANSLATE_DEFINE(SIGNAL_NEED_REINSTALL, "$ac_cv_signal_need_reinstall")
582
583	<	static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
584	<	{ if ((caddr_t)(sip->si_addr) != mem) exit(1);
585	<	munmap(mem, getpagesize()); close(zero_fd); exit(0); }
586	<
587	<	int main()
588	<	{ if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
589	<	if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
590	<	struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = SA_SIGINFO;
591	<	sigaction(SIGSEGV, &sa, 0);
592	<	mem[0] = 0;
593	<	exit(1); // should not be reached
583	>	dnl Check if sigaction handlers need to be reinstalled
584	>	AC_CACHE_CHECK("whether sigaction handlers need to be reinstalled",
585	>	ac_cv_sigaction_need_reinstall, [
586	>	AC_LANG_SAVE
587	>	AC_LANG_CPLUSPLUS
588	>	AC_TRY_RUN([
589	>	#include <stdlib.h>
590	>	#ifdef HAVE_UNISTD_H
591	>	#include <unistd.h>
592	>	#endif
593	>	#include <signal.h>
594	>	static int handled_signal = 0;
595	>	RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
596	>	typedef RETSIGTYPE (*signal_handler)(int);
597	>	static signal_handler mysignal(int sig, signal_handler handler) {
598	>	struct sigaction old_sa;
599	>	struct sigaction new_sa;
600	>	new_sa.sa_handler = handler;
601	>	return ((sigaction(sig,&new_sa,&old_sa) < 0) ? SIG_IGN : old_sa.sa_handler);
602		}
603	<	],
604	<	[ac_cv_have_extended_signals=yes],
605	<	[ac_cv_have_extended_signals=no]
603	>	int main(void) { /* returns 0 if signals need not to be reinstalled */
604	>	mysignal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
605	>	exit(handled_signal == 2);
606	>	}
607	>	], ac_cv_sigaction_need_reinstall=yes, ac_cv_sigaction_need_reinstall=no,
608	>	dnl When cross-compiling, do not assume anything.
609	>	ac_cv_sigaction_need_reinstall="guessing yes"
610	>	)
611	>	AC_LANG_RESTORE
612	>	]
613	>	)
614	>	AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall")
615	>
616	>	dnl Check if extended signals are supported.
617	>	AC_CACHE_CHECK("whether your system supports extended signal handlers",
618	>	ac_cv_have_extended_signals, [
619	>	AC_LANG_SAVE
620	>	AC_LANG_CPLUSPLUS
621	>	AC_TRY_RUN([
622	>	#define HAVE_SIGINFO_T 1
623	>	#define CONFIGURE_TEST_SIGSEGV_RECOVERY
624	>	#include "vm_alloc.cpp"
625	>	#include "sigsegv.cpp"
626	>	], ac_cv_have_extended_signals=yes, ac_cv_have_extended_signals=no,
627	>	dnl When cross-compiling, do not assume anything.
628	>	ac_cv_have_extended_signals=no
629		)
630		AC_LANG_RESTORE
631		]
632		)
633		AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
634	<
634	>
635		dnl Otherwise, check for subterfuges.
636		if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
637	<	case "$target_os" in
638	<	linux*)
639	<	if [[ "x$HAVE_I386" = "xyes" ]]; then
640	<	AC_CACHE_CHECK("whether we then have a subterfuge for your system",
641	<	ac_cv_have_sigcontext_hack, [
642	<	AC_LANG_SAVE
643	<	AC_LANG_CPLUSPLUS
644	<	AC_TRY_RUN([
645	<	#include <unistd.h>
646	<	#include <signal.h>
647	<	#include <fcntl.h>
648	<	#include <sys/mman.h>
649	<
650	<	static volatile caddr_t mem = 0;
651	<	static int zero_fd = -1;
652	<
392	<	static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
393	<	{ if ((caddr_t)(scs.cr2) != mem) exit(1);
394	<	munmap(mem, getpagesize()); close(zero_fd); exit(0); }
395	<
396	<	int main()
397	<	{ if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
398	<	if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
399	<	struct sigaction sa; sa.sa_flags = 0;
400	<	sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
401	<	sigaction(SIGSEGV, &sa, 0);
402	<	mem[0] = 0;
403	<	exit(1); // should not be reached
404	<	}
405	<	],
406	<	[ac_cv_have_sigcontext_hack=yes],
407	<	[ac_cv_have_sigcontext_hack=no]
408	<	)
409	<	AC_LANG_RESTORE
410	<	])
411	<	AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
412	<	elif [[ "x$HAVE_POWERPC" = "xyes" ]]; then
413	<	AC_CACHE_CHECK("whether we then have a subterfuge for your system",
414	<	ac_cv_have_sigcontext_hack, [
415	<	AC_LANG_SAVE
416	<	AC_LANG_CPLUSPLUS
417	<	AC_TRY_RUN([
418	<	#include <unistd.h>
419	<	#include <signal.h>
420	<	#include <fcntl.h>
421	<	#include <sys/mman.h>
422	<
423	<	static volatile caddr_t mem = 0;
424	<	static int zero_fd = -1;
425	<
426	<	static RETSIGTYPE segfault_handler(int, struct sigcontext_struct *scs)
427	<	{ if ((caddr_t)(scs->regs->dar) != mem) exit(1);
428	<	munmap(mem, getpagesize()); close(zero_fd); exit(0); }
429	<
430	<	int main()
431	<	{ if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
432	<	if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
433	<	struct sigaction sa; sa.sa_flags = 0;
434	<	sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
435	<	sigaction(SIGSEGV, &sa, 0);
436	<	mem[0] = 0;
437	<	exit(1); // should not be reached
438	<	}
439	<	],
440	<	[ac_cv_have_sigcontext_hack=yes],
441	<	[ac_cv_have_sigcontext_hack=no]
442	<	)
443	<	AC_LANG_RESTORE
444	<	])
445	<	AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
446	<	fi
447	<	;;
448	<	netbsd*)
449	<	if [[ "x$HAVE_M68K" = "xyes" ]]; then
450	<	AC_CACHE_CHECK("whether we then have a subterfuge for your system",
451	<	ac_cv_have_sigcontext_hack, [
452	<	AC_LANG_SAVE
453	<	AC_LANG_CPLUSPLUS
454	<	AC_TRY_RUN([
455	<	#include <unistd.h>
456	<	#include <signal.h>
457	<	#include <fcntl.h>
458	<	#include <sys/mman.h>
459	<
460	<	static volatile caddr_t mem = 0;
461	<	static int zero_fd = -1;
462	<
463	<	static RETSIGTYPE segfault_handler(int, int code)
464	<	{ if ((caddr_t)code != mem) exit(1);
465	<	munmap(mem, getpagesize()); close(zero_fd); exit(0); }
466	<
467	<	int main()
468	<	{ if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
469	<	if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
470	<	struct sigaction sa; sa.sa_flags = 0;
471	<	sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
472	<	sigaction(SIGSEGV, &sa, 0);
473	<	mem[0] = 0;
474	<	exit(1); // should not be reached
475	<	}
476	<	],
477	<	[ac_cv_have_sigcontext_hack=yes],
478	<	[ac_cv_have_sigcontext_hack=no]
479	<	)
480	<	AC_LANG_RESTORE
481	<	])
482	<	AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
483	<	fi
484	<	;;
485	<	esac
637	>	AC_CACHE_CHECK("whether we then have a subterfuge for your system",
638	>	ac_cv_have_sigcontext_hack, [
639	>	AC_LANG_SAVE
640	>	AC_LANG_CPLUSPLUS
641	>	AC_TRY_RUN([
642	>	#define HAVE_SIGCONTEXT_SUBTERFUGE 1
643	>	#define CONFIGURE_TEST_SIGSEGV_RECOVERY
644	>	#include "vm_alloc.cpp"
645	>	#include "sigsegv.cpp"
646	>	], ac_cv_have_sigcontext_hack=yes, ac_cv_have_sigcontext_hack=no,
647	>	dnl When cross-compiling, do not assume anything.
648	>	ac_cv_have_sigcontext_hack=no
649	>	)
650	>	AC_LANG_RESTORE
651	>	])
652	>	AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, "$ac_cv_have_sigcontext_hack")
653		fi
654
655	+	dnl Check if we can ignore the fault (instruction skipping in SIGSEGV handler)
656	+	AC_CACHE_CHECK("whether we can skip instruction in SIGSEGV handler",
657	+	ac_cv_have_skip_instruction, [
658	+	AC_LANG_SAVE
659	+	AC_LANG_CPLUSPLUS
660	+	AC_TRY_RUN([
661	+	#define HAVE_SIGSEGV_SKIP_INSTRUCTION 1
662	+	#define CONFIGURE_TEST_SIGSEGV_RECOVERY
663	+	#include "vm_alloc.cpp"
664	+	#include "sigsegv.cpp"
665	+	], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no,
666	+	dnl When cross-compiling, do not assume anything.
667	+	ac_cv_have_skip_instruction=no
668	+	)
669	+	AC_LANG_RESTORE
670	+	]
671	+	)
672	+	AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction")
673	+
674		dnl Can we do Video on SEGV Signals ?
675		CAN_VOSF=no
676		if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
#	Line 565 | Line 751 | AC_EGREP_CPP(yes,
751		#endif
752		], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
753
754	+	dnl Check for GCC 3.0 or higher.
755	+	HAVE_GCC30=no
756	+	AC_MSG_CHECKING(for GCC 3.0 or higher)
757	+	AC_EGREP_CPP(yes,
758	+	[#if __GNUC__ >= 3
759	+	yes
760	+	#endif
761	+	], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
762	+
763		dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
764	+	dnl Also set "-fno-exceptions" for C++ because exception handling requires
765	+	dnl the frame pointer.
766		if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
767		CFLAGS="$CFLAGS -fomit-frame-pointer"
768	<	CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
768	>	CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fno-exceptions"
769	>	fi
770	>
771	>	dnl (gb) Do not merge constants since it breaks fpu/fpu_x86.cpp.
772	>	dnl As of 2001/08/02, this affects the following compilers:
773	>	dnl Official: probably gcc-3.1 (mainline CVS)
774	>	dnl Mandrake: gcc-2.96 >= 0.59mdk, gcc-3.0.1 >= 0.1mdk
775	>	dnl Red Hat : gcc-2.96 >= 89, gcc-3.0 >= 1
776	>	if [[ "x$HAVE_GCC27" = "xyes" ]]; then
777	>	SAVED_CXXFLAGS="$CXXFLAGS"
778	>	CXXFLAGS="$CXXFLAGS -fno-merge-constants"
779	>	AC_CACHE_CHECK([whether GCC supports constants merging], ac_cv_gcc_constants_merging, [
780	>	AC_LANG_SAVE
781	>	AC_LANG_CPLUSPLUS
782	>	AC_TRY_COMPILE([],[],[ac_cv_gcc_constants_merging=yes],[ac_cv_gcc_constants_merging=no])
783	>	AC_LANG_RESTORE
784	>	])
785	>	if [[ "x$ac_cv_gcc_constants_merging" != "xyes" ]]; then
786	>	CXXFLAGS="$SAVED_CXXFLAGS"
787	>	fi
788		fi
789
790		dnl Select appropriate CPU source and REGPARAM define.
791		ASM_OPTIMIZATIONS=none
792		CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
793	<	FPUSRCS="../uae_cpu/fpp.cpp"
794	<	if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
793	>	FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
794	>	if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$OS_TYPE" != "xfreebsd" ]]; then
795		dnl i386 CPU
796		DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
797		if [[ "x$HAVE_GAS" = "xyes" ]]; then
#	Line 621 | Line 837 | if [[ "x$FPE_CORE" = "xdefault" ]]; then
837		DEFINES="$DEFINES -DFPU_X86"
838		FPE_CORE_STR="i386 optimized core"
839		FPUSRCS="../uae_cpu/fpu/fpu_x86.cpp"
840	+	FPE_CORE="i386"
841	+	else
842	+	FPE_CORE="uae"
843		fi
844		fi
845
#	Line 659 | Line 878 | fi
878
879		dnl Remove the "-g" option if set for GCC.
880		if [[ "x$HAVE_GCC27" = "xyes" ]]; then
881	<	dnl gb-- Probably not the cleanest way to take
882	<	CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
883	<	CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
881	>	CFLAGS=`echo $CFLAGS | sed -e 's/-g//g'`
882	>	CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-g//g'`
883	>	fi
884	>
885	>	dnl Or if we have -Ofast
886	>	if [[ "x$HAVE_OFAST" = "xyes" ]]; then
887	>	CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -Ofast"
888	>	CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -Ofast"
889	>	CXXFLAGS="-LANG:std $CXXFLAGS"
890	>	LDFLAGS="$LDFLAGS -ipa"
891		fi
892
893		dnl Generate Makefile.

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines