ViewVC Help

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

root/cebix/SheepShaver/src/Unix/configure.ac

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.6 by gbeauche, 2004-07-10T07:38:51Z vs.
Revision 1.24 by gbeauche, 2005-06-14T06:32:52Z

#	Line 17 | Line 17 | ulimit -c 0
17		dnl Options.
18		AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
19		AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
20	+	AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
21		AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
22	<	AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
22	>	AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
23		AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
24		AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
25	<	AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
25	>	AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
26	>	[case "$withval" in
27	>	gtk1)      WANT_GTK="gtk";;
28	>	gtk|gtk2)  WANT_GTK="$withval";;
29	>	yes)       WANT_GTK="gtk2 gtk";;
30	>	*)         WANT_GTK="no";;
31	>	esac],
32	>	[WANT_GTK="gtk2 gtk"])
33		AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
34		AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
35
36	+	dnl Addressing mode
37	+	AC_ARG_ENABLE(addressing,
38	+	[  --enable-addressing=AM  set the addressing mode to use [default=real]],
39	+	[case "$enableval" in
40	+	real)        WANT_ADDRESSING_MODE="real";;
41	+	direct)      WANT_ADDRESSING_MODE="direct";;
42	+	direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;;
43	+	esac],
44	+	[WANT_ADDRESSING_MODE="real"]
45	+	)
46	+
47		dnl SDL options.
48		AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
49		AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
50	+	AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
51
52		dnl Checks for programs.
53		AC_PROG_CC
#	Line 36 | Line 56 | AC_PROG_CXX
56		AC_PROG_MAKE_SET
57		AC_PROG_INSTALL
58		AC_PROG_EGREP
59	+	AC_PATH_PROGS(FILE, [file false])
60	+	AC_PATH_PROG(PERL, [perl])
61
62		dnl Check for PowerPC target CPU.
63		HAVE_PPC=no
#	Line 92 | Line 114 | if [[ "x$WANT_MON" = "xyes" ]]; then
114		WANT_MON=no
115		fi
116		fi
117	+	AC_SUBST(MONSRCS)
118
119		dnl Checks for libraries.
120		AC_CHECK_LIB(posix4, sem_init)
121
122		dnl Do we need SDL?
123		WANT_SDL=no
101	–	SDL_SUPPORT="none"
124		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
125		WANT_SDL=yes
126		WANT_XF86_DGA=no
127		WANT_XF86_VIDMODE=no
128		WANT_FBDEV_DGA=no
129	<	SDL_SUPPORT="video"
129	>	SDL_SUPPORT="$SDL_SUPPORT video"
130	>	fi
131	>	if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
132	>	WANT_SDL=yes
133	>	SDL_SUPPORT="$SDL_SUPPORT audio"
134		fi
135		if [[ "x$WANT_SDL" = "xyes" ]]; then
136		AC_PATH_PROG(sdl_config, "sdl-config")
137		if [[ -n "$sdl_config" ]]; then
138	<	sdl_cflags=`$sdl_config --cflags`
139	<	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
140	<	sdl_libs=`$sdl_config --static-libs`
141	<	else
142	<	sdl_libs=`$sdl_config --libs`
143	<	fi
138	>	case $target_os in
139	>	# Special treatment for Cygwin so that we can still use the POSIX layer
140	>	*cygwin*)
141	>	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
142	>	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
143	>	;;
144	>	*)
145	>	sdl_cflags=`$sdl_config --cflags`
146	>	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
147	>	sdl_libs=`$sdl_config --static-libs`
148	>	else
149	>	sdl_libs=`$sdl_config --libs`
150	>	fi
151	>	;;
152	>	esac
153		CFLAGS="$CFLAGS $sdl_cflags"
154		CXXFLAGS="$CXXFLAGS $sdl_cflags"
155		LIBS="$LIBS $sdl_libs"
156		else
157		WANT_SDL=no
158	+	WANT_SDL_VIDEO=no
159	+	WANT_SDL_AUDIO=no
160		fi
161	+	SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
162	+	else
163	+	SDL_SUPPORT="none"
164		fi
165
166		dnl We need X11, if not using SDL.
167	<	if [[ "x$WANT_SDL" = "xno" ]]; then
167	>	if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
168		AC_PATH_XTRA
169		if [[ "x$no_x" = "xyes" ]]; then
170		AC_MSG_ERROR([You need X11 to run SheepShaver.])
#	Line 137 | Line 177 | fi
177		dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
178		HAVE_PTHREADS=yes
179		case $EMULATED_PPC:$target_os in
180	<	no:linux*)
180	>	no:linux*|no:netbsd*)
181		dnl We do have our own pthread_cancel() implementation
182		AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
183		;;
#	Line 166 | Line 206 | no:linux*)
206		;;
207		esac
208
209	+	dnl We use FBDev DGA if possible.
210	+	if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
211	+	AC_CHECK_HEADER(linux/fb.h, [
212	+	AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
213	+	], [
214	+	AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
215	+	WANT_FBDEV_DGA=no
216	+	])
217	+	fi
218	+
219		dnl We use XFree86 DGA if possible.
220		if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
221		AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
#	Line 190 | Line 240 | fi
240
241		dnl We use GTK+ if possible.
242		UISRCS=../dummy/prefs_editor_dummy.cpp
243	<	if [[ "x$WANT_GTK" = "xyes" ]]; then
243	>	case "x$WANT_GTK" in
244	>	xgtk2*)
245	>	AM_PATH_GTK_2_0(1.3.15, [
246	>	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
247	>	CFLAGS="$CFLAGS $GTK_CFLAGS"
248	>	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
249	>	LIBS="$LIBS $GTK_LIBS"
250	>	UISRCS=prefs_editor_gtk.cpp
251	>	WANT_GTK=gtk2
252	>	], [
253	>	case "x${WANT_GTK}x" in
254	>	*gtkx)
255	>	AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
256	>	WANT_GTK=gtk
257	>	;;
258	>	*)
259	>	AC_MSG_WARN([Could not find GTK+, disabling user interface.])
260	>	WANT_GTK=no
261	>	;;
262	>	esac
263	>	])
264	>	;;
265	>	esac
266	>	if [[ "x$WANT_GTK" = "xgtk" ]]; then
267		AM_PATH_GTK(1.2.0, [
268		AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
269		CFLAGS="$CFLAGS $GTK_CFLAGS"
#	Line 222 | Line 295 | AC_SYS_LARGEFILE
295		dnl Checks for header files.
296		AC_HEADER_STDC
297		AC_HEADER_SYS_WAIT
298	+	AC_CHECK_HEADERS(malloc.h)
299		AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
300		AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
301		AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
#	Line 231 | Line 305 | AC_CHECK_HEADERS(linux/if.h, [], [], [
305		#endif
306		])
307		AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
308	+	AC_CHECK_HEADERS(fenv.h)
309
310		dnl Checks for typedefs, structures, and compiler characteristics.
311		AC_C_BIGENDIAN
#	Line 272 | Line 347 | AC_CHECK_FUNCS(sigaction signal)
347		AC_CHECK_FUNCS(mmap mprotect munmap)
348		AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
349		AC_CHECK_FUNCS(posix_memalign memalign valloc)
350	+	AC_CHECK_FUNCS(exp2f log2f exp2 log2 trunc)
351
352		dnl Darwin seems to define mach_task_self() instead of task_self().
353		AC_CHECK_FUNCS(mach_task_self task_self)
#	Line 283 | Line 359 | no:linux*)
359		;;
360		*:*)
361		AC_SEARCH_LIBS(clock_gettime, [rt posix4])
362	<	AC_CHECK_FUNCS(clock_gettime)
362	>	AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
363		;;
364		esac
365
366	+	dnl Check for headers and functions related to pty support (sshpty.c)
367	+	dnl From openssh-3.2.2p1 configure.ac
368	+	AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
369	+	AC_CHECK_FUNCS(_getpty vhangup strlcpy)
370	+
371	+	case "$host" in
372	+	*-*-hpux10.26)
373	+	disable_ptmx_check=yes
374	+	;;
375	+	*-*-linux*)
376	+	no_dev_ptmx=1
377	+	;;
378	+	mips-sony-bsd|mips-sony-newsos4)
379	+	AC_DEFINE(HAVE_NEWS4, 1, [Define if you are on NEWS-OS (additions from openssh-3.2.2p1, for sshpty.c).])
380	+	;;
381	+	*-*-sco3.2v4*)
382	+	no_dev_ptmx=1
383	+	;;
384	+	*-*-sco3.2v5*)
385	+	no_dev_ptmx=1
386	+	;;
387	+	*-*-cygwin*)
388	+	no_dev_ptmx=1
389	+	;;
390	+	esac
391	+
392	+	if test -z "$no_dev_ptmx" ; then
393	+	if test "x$disable_ptmx_check" != "xyes" ; then
394	+	AC_CHECK_FILE([/dev/ptmx],
395	+	[
396	+	AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx.])
397	+	have_dev_ptmx=1
398	+	]
399	+	)
400	+	fi
401	+	fi
402	+	AC_CHECK_FILE([/dev/ptc],
403	+	[
404	+	AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1, [Define if you have /dev/ptc.])
405	+	have_dev_ptc=1
406	+	]
407	+	)
408	+	dnl (end of code from openssh-3.2.2p1 configure.ac)
409	+
410		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
411		AC_DEFUN(AC_CHECK_FRAMEWORK, [
412		AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
#	Line 322 | Line 442 | linux*)
442		AUDIOSRC=audio_oss_esd.cpp
443		SCSISRC=Linux/scsi_linux.cpp
444		if [[ "x$EMULATED_PPC" = "xno" ]]; then
445	<	EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
445	>	EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
446	>	fi
447	>	;;
448	>	netbsd*)
449	>	if [[ "x$EMULATED_PPC" = "xno" ]]; then
450	>	EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
451		fi
452		;;
453		darwin*)
454		if [[ "x$EMULATED_PPC" = "xno" ]]; then
455	<	EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
455	>	EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
456		fi
457		if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
458		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
#	Line 336 | Line 461 | darwin*)
461		EXTFSSRC=../MacOSX/extfs_macosx.mm
462		fi
463		;;
464	+	cygwin*)
465	+	SERIALSRC="../dummy/serial_dummy.cpp"
466	+	;;
467		esac
468
469		dnl SDL overrides
#	Line 343 | Line 471 | if [[ "x$WANT_SDL" = "xyes" ]]; then
471		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
472		fi
473		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
346	–	VIDEOSRCS="../SDL/video_sdl.cpp"
474		AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
475	+	VIDEOSRCS="../SDL/video_sdl.cpp"
476		KEYCODES="../SDL/keycodes"
477		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
478		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
479		else
480	<	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
480	>	case "$target_os" in
481	>	cygwin*)
482	>	EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
483	>	;;
484	>	*)
485	>	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
486	>	;;
487	>	esac
488		fi
489		else
490		VIDEOSRCS="video_x.cpp"
491		KEYCODES="keycodes"
492		EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
493		fi
494	+	if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
495	+	AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
496	+	AUDIOSRC="../SDL/audio_sdl.cpp"
497	+	fi
498
499	<	SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
499	>	SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
500
501		dnl Define a macro that translates a yesno-variable into a C macro definition
502		dnl to be put into the config.h file
#	Line 661 | Line 800 | fi
800		AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
801		[Define if your system supports Mach exceptions.])
802
803	+	dnl Check if Windows exceptions are supported.
804	+	AC_CACHE_CHECK([whether your system supports Windows exceptions],
805	+	ac_cv_have_win32_exceptions, [
806	+	AC_LANG_SAVE
807	+	AC_LANG_CPLUSPLUS
808	+	AC_TRY_RUN([
809	+	#define HAVE_WIN32_EXCEPTIONS 1
810	+	#define CONFIGURE_TEST_SIGSEGV_RECOVERY
811	+	#include "vm_alloc.cpp"
812	+	#include "sigsegv.cpp"
813	+	], [
814	+	sigsegv_recovery=win32
815	+	ac_cv_have_win32_exceptions=yes
816	+	],
817	+	ac_cv_have_win32_exceptions=no,
818	+	dnl When cross-compiling, do not assume anything.
819	+	ac_cv_have_win32_exceptions=no
820	+	)
821	+	AC_LANG_RESTORE
822	+	]
823	+	)
824	+	AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
825	+	[Define if your system supports Windows exceptions.])
826	+
827		dnl Otherwise, check if extended signals are supported.
828		if [[ -z "$sigsegv_recovery" ]]; then
829		AC_CACHE_CHECK([whether your system supports extended signal handlers],
#	Line 747 | Line 910 | else
910		WANT_VOSF=no
911		fi
912
913	+	dnl Check addressing mode to use
914	+	AC_MSG_CHECKING([for addressing mode to use])
915	+	case "$os_target" in
916	+	cygwin*)
917	+	WANT_ADDRESSING_MODE="direct,cygwin-hack"
918	+	NATMEM_OFFSET=
919	+	;;
920	+	esac
921	+	if [[ "$EMULATED_PPC" != "yes" ]]; then
922	+	if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
923	+	AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
924	+	WANT_ADDRESSING_MODE="real"
925	+	fi
926	+	fi
927	+	if [[ "$WANT_ADDRESSING_MODE" = "direct" ]]; then
928	+	if [[ -n "$NATMEM_OFFSET" ]]; then
929	+	NATMEM_OFFSET_DEF="-DNATMEM_OFFSET=$NATMEM_OFFSET"
930	+	fi
931	+	AC_LANG_SAVE
932	+	AC_LANG_CPLUSPLUS
933	+	cat confdefs.h > conftest.$ac_ext
934	+	cat >> conftest.$ac_ext << EOF
935	+	#include <stdio.h>
936	+	#include <string.h>
937	+	#include "vm_alloc.cpp"
938	+
939	+	int main(void)
940	+	{
941	+	if (vm_init() < 0)
942	+	return 1;
943	+
944	+	static const struct {
945	+	unsigned long base;
946	+	unsigned int size;
947	+	} ranges[[]] = {
948	+	{ 0x00000000, 0x0003000 },
949	+	{ 0x10000000, 0x2000000 },
950	+	{ 0x40800000, 0x0400000 },
951	+	{ 0x68070000, 0x0010000 },
952	+	{ 0x69000000, 0x0080000 },
953	+	{ 0x68ffe000, 0x0002000 },
954	+	{ 0x5fffe000, 0x0002000 },
955	+	{ 0x60000000, 0x0040000 },
956	+	};
957	+	const int n_ranges = sizeof(ranges)/ sizeof(ranges[[0]]);
958	+
959	+	#ifdef NATMEM_OFFSET
960	+	unsigned long ofs = NATMEM_OFFSET;
961	+	#else
962	+	for (unsigned long ofs = 0x10000000; ofs <= 0x90000000; ofs += 0x10000000)
963	+	#endif
964	+	for (int i = 0; i < n_ranges; i++) {
965	+	char *m = (char *)(ranges[[i]].base + ofs);
966	+	if (vm_acquire_fixed(m, ranges[[i]].size) != 0)
967	+	break;
968	+	memset(m, 0, ranges[[i]].size);
969	+	vm_release(m, ranges[[i]].size);
970	+	if (i == n_ranges - 1) {
971	+	if (sizeof(void *) == 8 && ofs > 0xffffffff)
972	+	printf("0x%lxul\n", ofs);
973	+	else
974	+	printf("0x%08x\n", ofs);
975	+	return 0;
976	+	}
977	+	}
978	+
979	+	vm_exit();
980	+	return 1;
981	+	}
982	+	EOF
983	+	doit='$CXX conftest.$ac_ext -o conftest.$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS $NATMEM_OFFSET_DEF >& AS_MESSAGE_LOG_FD'
984	+	if AC_TRY_EVAL(doit); then
985	+	NATMEM_OFFSET=`./conftest.$ac_exeext`
986	+	else
987	+	NATMEM_OFFSET=
988	+	fi
989	+	rm -f conftest*
990	+	AC_LANG_RESTORE
991	+
992	+	if [[ -z "$NATMEM_OFFSET" ]]; then
993	+	AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
994	+	else
995	+	WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
996	+	AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
997	+	[Define constant offset for Mac address translation])
998	+	fi
999	+	fi
1000	+	AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1001	+
1002		dnl Platform specific binary postprocessor
1003		AC_PATH_PROG(BLESS, "true")
1004		if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
#	Line 780 | Line 1032 | if $CXX -V -v 2>&1 | grep -q "Intel(R) C
1032		fi
1033		AC_MSG_RESULT($HAVE_ICC)
1034
1035	<	# Test if the compiler can generate ELF objects
1036	<	AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1037	<	ac_cv_elf_objects, [
1035	>	dnl Determine the generated object format
1036	>	AC_CACHE_CHECK([the format of compiler generated objects],
1037	>	ac_cv_object_format, [
1038		echo 'int i;' > conftest.$ac_ext
1039	<	ac_cv_elf_objects=no
1039	>	ac_cv_object_format=no
1040		if AC_TRY_EVAL(ac_compile); then
1041		case `/usr/bin/file conftest.$ac_objext` in
1042		*"ELF"*)
1043	<	ac_cv_elf_objects=yes
1043	>	ac_cv_object_format=elf
1044	>	;;
1045	>	*"Mach-O"*)
1046	>	ac_cv_object_format=mach
1047	>	;;
1048	>	*)
1049	>	ac_cv_object_format=unknown
1050		;;
1051		esac
1052		fi
1053		rm -rf conftest*
1054		])
797	–	ELF_OBJECTS=$ac_cv_elf_objects
1055
1056		dnl CPU emulator sources
1057		if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1058		CPUSRCS="\
1059	+	../kpx_cpu/src/mathlib/ieeefp.cpp \
1060		../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1061		../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1062		../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
#	Line 809 | Line 1067 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1067		if [[ "x$WANT_JIT" = "xyes" ]]; then
1068		AC_CACHE_CHECK([whether dyngen can be used],
1069		ac_cv_use_dyngen, [
1070	<	case $host_cpu:$ELF_OBJECTS in
1071	<	powerpc:yes)
1070	>	case $host_cpu:$ac_cv_object_format in
1071	>	powerpc:elf)
1072		ac_cv_use_dyngen=yes
1073		;;
1074	<	x86_64:yes)
1074	>	x86_64:elf)
1075		ac_cv_use_dyngen=yes
1076		;;
1077	<	i?86:yes)
1077	>	i?86:elf)
1078	>	ac_cv_use_dyngen=yes
1079	>	;;
1080	>	powerpc:mach)
1081		ac_cv_use_dyngen=yes
1082		;;
1083		*:*)
#	Line 844 | Line 1105 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1105		case $host_cpu in
1106		i?86)
1107		DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
847	–	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
848	–	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
849	–	else
850	–	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
851	–	fi
852	–	saved_CPPFLAGS=$CPPFLAGS
853	–	CPPFLAGS="$CPPFLAGS -mmmx"
854	–	AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
855	–	CPPFLAGS="$CPPFLAGS -msse"
856	–	AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
857	–	CPPFLAGS="$CPPFLAGS -msse2"
858	–	AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
859	–	CPPFLAGS=$saved_CPPFLAGS
1108		;;
1109	<	x86_64)
1110	<	AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1109	>	powerpc)
1110	>	if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1111	>	DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1112	>	fi
1113		;;
1114		esac
1115	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1115	>	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1116	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1117	>	else
1118	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1119	>	fi
1120	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1121		if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1122		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1123		fi
#	Line 904 | Line 1159 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1159		ac_cv_have_static_data_exec=no
1160		)
1161		])
1162	+	else
1163	+	ac_cv_use_dyngen=no
1164		fi
1165		AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1166		[Define if your system marks static data pages as executable.])
#	Line 913 | Line 1170 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1170		fi
1171
1172		dnl Generate Makefile.
1173	+	AC_SUBST(PERL)
1174	+	AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1175		AC_SUBST(DYNGENSRCS)
1176		AC_SUBST(DYNGEN_CC)
1177		AC_SUBST(DYNGEN_OP_FLAGS)
#	Line 930 | Line 1189 | echo
1189		echo SheepShaver configuration summary:
1190		echo
1191		echo SDL support ...................... : $SDL_SUPPORT
1192	+	echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1193		echo XFree86 DGA support .............. : $WANT_XF86_DGA
1194		echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1195		echo Using PowerPC emulator ........... : $EMULATED_PPC
#	Line 938 | Line 1198 | echo Enable video on SEGV signals .....
1198		echo ESD sound support ................ : $WANT_ESD
1199		echo GTK user interface ............... : $WANT_GTK
1200		echo mon debugger support ............. : $WANT_MON
1201	+	echo Addressing mode .................. : $WANT_ADDRESSING_MODE
1202		echo Bad memory access recovery type .. : $sigsegv_recovery
1203		echo
1204		echo "Configuration done. Now type \"make\"."

Diff Legend

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