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.22 by gbeauche, 2005-05-12T11:21:10Z

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

Diff Legend

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