ViewVC Help

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

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

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.33 by gbeauche, 2004-11-02T20:40:54Z vs.
Revision 1.62 by gbeauche, 2006-03-14T21:18:44Z

#	Line 21 | Line 21 | AC_ARG_ENABLE(fbdev-dga,     [  --enable
21		AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
22
23		dnl SDL options.
24	+	AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
25		AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
26		AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
27
#	Line 59 | Line 60 | AC_ARG_ENABLE(addressing,
60
61		dnl External packages.
62		AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
63	<	AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
63	>	AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]],
64	>	[case "$withval" in
65	>	gtk1)      WANT_GTK="gtk";;
66	>	gtk|gtk2)  WANT_GTK="$withval";;
67	>	yes)       WANT_GTK="gtk2 gtk";;
68	>	*)         WANT_GTK="no";;
69	>	esac],
70	>	[WANT_GTK="gtk2 gtk"])
71		AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
72
73		dnl Canonical system information.
#	Line 98 | Line 106 | AC_PROG_CPP
106		AC_PROG_CXX
107		AC_PROG_MAKE_SET
108		AC_PROG_INSTALL
109	+	AC_PROG_EGREP
110
111		dnl We use mon if possible.
112		MONSRCS=
#	Line 126 | Line 135 | fi
135		dnl Checks for libraries.
136		AC_CHECK_LIB(posix4, sem_init)
137		AC_CHECK_LIB(rt, timer_create)
138	+	AC_CHECK_LIB(rt, shm_open)
139	+	AC_CHECK_LIB(m, cos)
140
141		dnl Do we need SDL?
142		WANT_SDL=no
#	Line 143 | Line 154 | fi
154		if [[ "x$WANT_SDL" = "xyes" ]]; then
155		AC_PATH_PROG(sdl_config, "sdl-config")
156		if [[ -n "$sdl_config" ]]; then
157	<	sdl_cflags=`$sdl_config --cflags`
158	<	sdl_libs=`$sdl_config --libs`
157	>	case $target_os in
158	>	# Special treatment for Cygwin so that we can still use the POSIX layer
159	>	*cygwin*)
160	>	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
161	>	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
162	>	;;
163	>	*)
164	>	sdl_cflags=`$sdl_config --cflags`
165	>	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
166	>	sdl_libs=`$sdl_config --static-libs`
167	>	else
168	>	sdl_libs=`$sdl_config --libs`
169	>	fi
170	>	;;
171	>	esac
172		CFLAGS="$CFLAGS $sdl_cflags"
173		CXXFLAGS="$CXXFLAGS $sdl_cflags"
174		LIBS="$LIBS $sdl_libs"
#	Line 179 | Line 203 | AC_CHECK_LIB(pthread, pthread_create, ,
203		if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
204		AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
205		fi
206	<	AC_CHECK_FUNCS(pthread_cancel)
206	>	AC_CHECK_FUNCS(pthread_cond_init)
207	>	AC_CHECK_FUNCS(pthread_cancel pthread_testcancel)
208		AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
209		AC_CHECK_FUNCS(pthread_mutexattr_settype)
210		AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
#	Line 223 | Line 248 | fi
248
249		dnl We use GTK+ if possible.
250		UISRCS=../dummy/prefs_editor_dummy.cpp
251	<	if [[ "x$WANT_GTK" = "xyes" ]]; then
251	>	case "x$WANT_GTK" in
252	>	xgtk2*)
253	>	AM_PATH_GTK_2_0(1.3.15, [
254	>	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
255	>	CFLAGS="$CFLAGS $GTK_CFLAGS"
256	>	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257	>	LIBS="$LIBS $GTK_LIBS"
258	>	UISRCS=prefs_editor_gtk.cpp
259	>	WANT_GTK=gtk2
260	>	], [
261	>	case "x${WANT_GTK}x" in
262	>	*gtkx)
263	>	AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
264	>	WANT_GTK=gtk
265	>	;;
266	>	*)
267	>	AC_MSG_WARN([Could not find GTK+, disabling user interface.])
268	>	WANT_GTK=no
269	>	;;
270	>	esac
271	>	])
272	>	;;
273	>	esac
274	>	if [[ "x$WANT_GTK" = "xgtk" ]]; then
275		AM_PATH_GTK(1.2.0, [
276		AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
277		CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
#	Line 262 | Line 310 | AC_SYS_LARGEFILE
310
311		dnl Checks for header files.
312		AC_HEADER_STDC
313	+	AC_CHECK_HEADERS(stdlib.h stdint.h)
314		AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
315		AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
316	<	AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h)
316	>	AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
317	>	AC_CHECK_HEADERS(sys/poll.h sys/select.h)
318	>	AC_CHECK_HEADERS(arpa/inet.h)
319	>	AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
320	>	#ifdef HAVE_SYS_TYPES_H
321	>	#include <sys/types.h>
322	>	#endif
323	>	#ifdef HAVE_SYS_SOCKET_H
324	>	#include <sys/socket.h>
325	>	#endif
326	>	])
327		AC_CHECK_HEADERS(AvailabilityMacros.h)
328	+	AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
329
330		dnl Checks for typedefs, structures, and compiler characteristics.
331		AC_C_BIGENDIAN
#	Line 305 | Line 365 | if [[ "x$ac_cv_type_socklen_t" != "xyes"
365		fi
366
367		dnl Checks for library functions.
368	<	AC_CHECK_FUNCS(strdup cfmakeraw)
368	>	AC_CHECK_FUNCS(strdup strerror cfmakeraw)
369		AC_CHECK_FUNCS(clock_gettime timer_create)
370		AC_CHECK_FUNCS(sigaction signal)
371		AC_CHECK_FUNCS(mmap mprotect munmap)
372		AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
373	+	AC_CHECK_FUNCS(poll inet_aton)
374
375		dnl Darwin seems to define mach_task_self() instead of task_self().
376		AC_CHECK_FUNCS(mach_task_self task_self)
#	Line 336 | Line 397 | mips-sony-bsd|mips-sony-newsos4)
397		*-*-sco3.2v5*)
398		no_dev_ptmx=1
399		;;
400	+	*-*-cygwin*)
401	+	no_dev_ptmx=1
402	+	;;
403		esac
404
405		if test -z "$no_dev_ptmx" ; then
#	Line 358 | Line 422 | AC_CHECK_FILE([/dev/ptc],
422		dnl (end of code from openssh-3.2.2p1 configure.ac)
423
424
425	+	dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
426	+	dnl doesn't work or is unimplemented. On these systems (mostly older
427	+	dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
428	+	AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
429	+	ac_cv_nonblocking_io, [
430	+	case "$host" in
431	+	*-*-osf*)
432	+	ac_cv_nonblocking_io=FIONBIO
433	+	;;
434	+	*-*-sunos4*)
435	+	ac_cv_nonblocking_io=FIONBIO
436	+	;;
437	+	*-*-ultrix*)
438	+	ac_cv_nonblocking_io=FIONBIO
439	+	;;
440	+	*)
441	+	ac_cv_nonblocking_io=O_NONBLOCK
442	+	;;
443	+	esac
444	+	])
445	+	if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
446	+	AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
447	+	fi
448	+
449	+	dnl Check whether compiler supports byte bit-fields
450	+	AC_CACHE_CHECK([whether compiler supports byte bit-fields],
451	+	ac_cv_have_byte_bitfields, [
452	+	AC_LANG_SAVE
453	+	AC_LANG_CPLUSPLUS
454	+	AC_TRY_RUN([
455	+	struct A {
456	+	unsigned char b1:4;
457	+	unsigned char b2:4;
458	+	unsigned char c;
459	+	unsigned short s;
460	+	unsigned char a[4];
461	+	};
462	+
463	+	int main(void) {
464	+	A a;
465	+	return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
466	+	}],
467	+	[ac_cv_have_byte_bitfields=yes],
468	+	[ac_cv_have_byte_bitfields=no],
469	+	dnl When cross-compiling, assume only GCC supports this
470	+	[if [[ "$GCC" = "yes" ]]; then
471	+	ac_cv_have_byte_bitfields="guessing yes"
472	+	else
473	+	ac_cv_have_byte_bitfields="guessing no"
474	+	fi]
475	+	)
476	+	AC_LANG_RESTORE
477	+	])
478	+
479		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
480	<	AC_DEFUN(AC_CHECK_FRAMEWORK, [
480	>	AC_DEFUN([AC_CHECK_FRAMEWORK], [
481		AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
482		AC_CACHE_CHECK([whether compiler supports framework $1],
483		ac_Framework, [
484		saved_LIBS="$LIBS"
485		LIBS="$LIBS -framework $1"
486		AC_TRY_LINK(
487	<	[$2], [int main(void) { return 0; }],
487	>	[$2], [],
488		[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
489		)
490		])
#	Line 379 | Line 497 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
497		dnl Check for some MacOS X frameworks
498		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
499		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
500	+	AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
501
502		dnl Select system-dependant source files.
503		SERIALSRC=serial_unix.cpp
504		ETHERSRC=../dummy/ether_dummy.cpp
505		SCSISRC=../dummy/scsi_dummy.cpp
506		AUDIOSRC=../dummy/audio_dummy.cpp
507	+	EXTFSSRC=extfs_unix.cpp
508		EXTRASYSSRCS=
509		CAN_NATIVE_M68K=no
510		case "$target_os" in
#	Line 418 | Line 538 | freebsd*)
538		;;
539		netbsd*)
540		CAN_NATIVE_M68K=yes
541	+	ETHERSRC=ether_unix.cpp
542		;;
543		solaris*)
544		AUDIOSRC=Solaris/audio_solaris.cpp
545		DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
546		;;
547		irix*)
427	–	ETHERSRC=ether_unix.cpp
548		AUDIOSRC=Irix/audio_irix.cpp
549		EXTRASYSSRCS=Irix/unaligned.c
430	–	dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
431	–	DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
550		LIBS="$LIBS -laudio"
551		WANT_ESD=no
552
#	Line 438 | Line 556 | irix*)
556		CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
557		AC_MSG_CHECKING(if "-IPA" works)
558		dnl Do a test compile of an empty function
559	<	AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
559	>	AC_TRY_COMPILE([#if defined __GNUC__
560	>	# error GCC does not support IPA yet
561	>	#endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
562		CFLAGS="$ocflags"
563		;;
564		darwin*)
565	<	if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
565	>	ETHERSRC=ether_unix.cpp
566	>	if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
567		EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
568		fi
569	+	if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
570	+	EXTFSSRC=../MacOSX/extfs_macosx.mm
571	+	fi
572	+	;;
573	+	cygwin*)
574	+	SERIALSRC="../dummy/serial_dummy.cpp"
575	+	EXTRASYSSRCS="../Windows/BasiliskII.rc"
576		;;
577		esac
578	+
579	+	dnl Is the slirp library supported?
580	+	case "$ac_cv_have_byte_bitfields" in
581	+	yes|"guessing yes")
582	+	CAN_SLIRP=yes
583	+	ETHERSRC=ether_unix.cpp
584	+	;;
585	+	esac
586	+	if [[ -n "$CAN_SLIRP" ]]; then
587	+	AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
588	+	SLIRP_SRCS="\
589	+	../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
590	+	../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
591	+	../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
592	+	../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
593	+	../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
594	+	../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
595	+	fi
596	+	AC_SUBST(SLIRP_SRCS)
597	+
598		dnl SDL overrides
599		if [[ "x$WANT_SDL" = "xyes" ]]; then
600		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
#	Line 458 | Line 606 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
606		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
607		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
608		else
609	<	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
609	>	case "$target_os" in
610	>	cygwin*)
611	>	EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
612	>	;;
613	>	*)
614	>	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
615	>	;;
616	>	esac
617		fi
618		else
619		VIDEOSRCS="video_x.cpp"
#	Line 484 | Line 639 | if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
639		ETHERSRC=../dummy/ether_dummy.cpp
640		AUDIOSRC=../dummy/audio_dummy.cpp
641		fi
642	<	SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
642	>	SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
643
644		dnl Define a macro that translates a yesno-variable into a C macro definition
645		dnl to be put into the config.h file
646		dnl $1 -- the macro to define
647		dnl $2 -- the value to translate
648		dnl $3 -- template name
649	<	AC_DEFUN(AC_TRANSLATE_DEFINE, [
649	>	AC_DEFUN([AC_TRANSLATE_DEFINE], [
650		if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
651		AC_DEFINE($1, 1, $3)
652		fi
#	Line 702 | Line 857 | AC_CACHE_CHECK([whether we can map Low M
857		]
858		)
859
860	+	dnl Check if we have POSIX shared memory support
861	+	AC_CACHE_CHECK([whether POSIX shared memory is working],
862	+	ac_cv_have_posix_shm, [
863	+	AC_LANG_SAVE
864	+	AC_LANG_CPLUSPLUS
865	+	AC_TRY_RUN([
866	+	#define HAVE_POSIX_SHM
867	+	#include "vm_alloc.cpp"
868	+	int main(void) { /* returns 0 if we have working POSIX shm */
869	+	if (vm_init() < 0) exit(2);
870	+	char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
871	+	if (m1 == VM_MAP_FAILED) exit(3);
872	+	vm_exit(); exit(0);
873	+	}
874	+	], ac_cv_have_posix_shm=yes, ac_cv_have_posix_shm=no,
875	+	dnl When cross-compiling, do not assume anything.
876	+	ac_cv_have_posix_shm="guessing no"
877	+	)
878	+	AC_LANG_RESTORE
879	+	]
880	+	)
881	+	AC_TRANSLATE_DEFINE(HAVE_POSIX_SHM, "$ac_cv_have_posix_shm",
882	+	[Define if your system supports POSIX shared memory.])
883	+
884	+	dnl Check if we have working 33-bit memory addressing
885	+	AC_CACHE_CHECK([whether 33-bit memory addressing is working],
886	+	ac_cv_have_33bit_addressing, [
887	+	AC_LANG_SAVE
888	+	AC_LANG_CPLUSPLUS
889	+	AC_TRY_RUN([
890	+	#define USE_33BIT_ADDRESSING 1
891	+	#include "vm_alloc.cpp"
892	+	int main(void) { /* returns 0 if we have working 33-bit addressing */
893	+	if (sizeof(void *) < 8) exit(1);
894	+	if (vm_init() < 0) exit(2);
895	+	char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
896	+	if (m1 == VM_MAP_FAILED) exit(3);
897	+	char *m2 = m1 + (1L << 32);
898	+	m1[0] = 0x12; if (m2[0] != 0x12) exit(4);
899	+	m2[0] = 0x34; if (m1[0] != 0x34) exit(5);
900	+	vm_exit(); exit(0);
901	+	}
902	+	], ac_cv_have_33bit_addressing=yes, ac_cv_have_33bit_addressing=no,
903	+	dnl When cross-compiling, do not assume anything.
904	+	ac_cv_have_33bit_addressing="guessing no"
905	+	)
906	+	AC_LANG_RESTORE
907	+	]
908	+	)
909	+
910		dnl Check signal handlers need to be reinstalled
911		AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
912		ac_cv_signal_need_reinstall, [
#	Line 787 | Line 992 | AC_CACHE_CHECK([whether your system supp
992		AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
993		[Define if your system supports Mach exceptions.])
994
995	+	dnl Check if Windows exceptions are supported.
996	+	AC_CACHE_CHECK([whether your system supports Windows exceptions],
997	+	ac_cv_have_win32_exceptions, [
998	+	AC_LANG_SAVE
999	+	AC_LANG_CPLUSPLUS
1000	+	AC_TRY_RUN([
1001	+	#define HAVE_WIN32_EXCEPTIONS 1
1002	+	#define CONFIGURE_TEST_SIGSEGV_RECOVERY
1003	+	#include "vm_alloc.cpp"
1004	+	#include "sigsegv.cpp"
1005	+	], [
1006	+	sigsegv_recovery=win32
1007	+	ac_cv_have_win32_exceptions=yes
1008	+	],
1009	+	ac_cv_have_win32_exceptions=no,
1010	+	dnl When cross-compiling, do not assume anything.
1011	+	ac_cv_have_win32_exceptions=no
1012	+	)
1013	+	AC_LANG_RESTORE
1014	+	]
1015	+	)
1016	+	AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
1017	+	[Define if your system supports Windows exceptions.])
1018	+
1019		dnl Otherwise, check if extended signals are supported.
1020		if [[ -z "$sigsegv_recovery" ]]; then
1021		AC_CACHE_CHECK([whether your system supports extended signal handlers],
#	Line 867 | Line 1096 | fi
1096		dnl A dummy program that returns always true
1097		AC_PATH_PROG([BLESS], "true")
1098
1099	+	dnl Check for linker script support
1100	+	case $target_os:$target_cpu in
1101	+	linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1102	+	linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1103	+	darwin*:powerpc)LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1104	+	esac
1105	+	if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1106	+	AC_CACHE_CHECK([whether linker script is usable],
1107	+	ac_cv_linker_script_works, [
1108	+	AC_LANG_SAVE
1109	+	AC_LANG_CPLUSPLUS
1110	+	saved_LDFLAGS="$LDFLAGS"
1111	+	LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1112	+	AC_TRY_RUN(
1113	+	[int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1114	+	[ac_cv_linker_script_works=yes],
1115	+	[ac_cv_linker_script_works=no],
1116	+	dnl When cross-compiling, assume it works
1117	+	[ac_cv_linker_script_works="guessing yes"]
1118	+	)
1119	+	AC_LANG_RESTORE
1120	+	if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1121	+	LDFLAGS="$saved_LDFLAGS"
1122	+	LINKER_SCRIPT_FLAGS=""
1123	+	fi
1124	+	])
1125	+	fi
1126	+	AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1127	+	[Define if there is a linker script to relocate the executable above 0x70000000.])
1128	+
1129		dnl Determine the addressing mode to use
1130		if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1131		ADDRESSING_MODE="real"
#	Line 944 | Line 1203 | AC_MSG_RESULT($HAVE_GAS)
1203		dnl Check for GCC 2.7 or higher.
1204		HAVE_GCC27=no
1205		AC_MSG_CHECKING(for GCC 2.7 or higher)
1206	<	AC_EGREP_CPP(xyes,
1207	<	[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1208	<	xyes
1209	<	#endif
1210	<	], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1206	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1207	>	# error gcc < 2.7
1208	>	#endif
1209	>	]])],
1210	>	[AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1211	>	[AC_MSG_RESULT(no)])
1212
1213		dnl Check for GCC 3.0 or higher.
1214		HAVE_GCC30=no
1215		AC_MSG_CHECKING(for GCC 3.0 or higher)
1216	<	AC_EGREP_CPP(xyes,
1217	<	[#if __GNUC__ >= 3
1218	<	xyes
1219	<	#endif
1220	<	], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1216	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1217	>	# error gcc < 3
1218	>	#endif
1219	>	]])],
1220	>	[AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1221	>	[AC_MSG_RESULT(no)])
1222	>
1223	>	dnl Check for ICC.
1224	>	AC_MSG_CHECKING(for ICC)
1225	>	HAVE_ICC=no
1226	>	if $CXX -V -v 2>&1 | grep -q "Intel(R) C++ Compiler"; then
1227	>	HAVE_ICC=yes
1228	>	fi
1229	>	AC_MSG_RESULT($HAVE_ICC)
1230
1231		dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
1232		dnl Also set "-fno-exceptions" for C++ because exception handling requires
#	Line 972 | Line 1241 | dnl As of 2001/08/02, this affects the f
1241		dnl Official: probably gcc-3.1 (mainline CVS)
1242		dnl Mandrake: gcc-2.96 >= 0.59mdk, gcc-3.0.1 >= 0.1mdk
1243		dnl Red Hat : gcc-2.96 >= 89, gcc-3.0 >= 1
1244	<	if [[ "x$HAVE_GCC27" = "xyes" ]]; then
1244	>	if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1245		SAVED_CXXFLAGS="$CXXFLAGS"
1246		CXXFLAGS="$CXXFLAGS -fno-merge-constants"
1247		AC_CACHE_CHECK([whether GCC supports constants merging], ac_cv_gcc_constants_merging, [
#	Line 988 | Line 1257 | fi
1257
1258		dnl Store motion was introduced in 3.3-hammer branch and any gcc >= 3.4
1259		dnl However, there are some corner cases exposed on x86-64
1260	<	if [[ "x$HAVE_GCC27" = "xyes" ]]; then
1260	>	if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1261		SAVED_CXXFLAGS="$CXXFLAGS"
1262		CXXFLAGS="$CXXFLAGS -fno-gcse-sm"
1263		AC_CACHE_CHECK([whether GCC supports store motion], ac_cv_gcc_store_motion, [
#	Line 1002 | Line 1271 | if [[ "x$HAVE_GCC27" = "xyes" ]]; then
1271		fi
1272		fi
1273
1274	+	dnl Add -fno-strict-aliasing for slirp sources
1275	+	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1276	+	SAVED_CFLAGS="$CFLAGS"
1277	+	CFLAGS="$CFLAGS -fno-strict-aliasing"
1278	+	AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1279	+	ac_cv_gcc_no_strict_aliasing, [
1280	+	AC_TRY_COMPILE([],[],
1281	+	[ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1282	+	[ac_cv_gcc_no_strict_aliasing=no])
1283	+	])
1284	+	CFLAGS="$SAVED_CFLAGS"
1285	+	fi
1286	+
1287	+	dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1288	+	if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1289	+	SAVED_CFLAGS="$CFLAGS"
1290	+	CFLAGS="$CFLAGS -mdynamic-no-pic"
1291	+	AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1292	+	ac_cv_gcc_mdynamic_no_pic, [
1293	+	AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1294	+	])
1295	+	if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1296	+	CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1297	+	else
1298	+	CFLAGS="$SAVED_CFLAGS"
1299	+	fi
1300	+	fi
1301	+
1302		dnl Select appropriate CPU source and REGPARAM define.
1303		ASM_OPTIMIZATIONS=none
1304		CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
#	Line 1028 | Line 1325 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1325		DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1326		JITSRCS="cpuemu1_nf.cpp cpuemu2_nf.cpp cpuemu3_nf.cpp cpuemu4_nf.cpp cpuemu5_nf.cpp cpuemu6_nf.cpp cpuemu7_nf.cpp cpuemu8_nf.cpp $JITSRCS"
1327		CAN_JIT=yes
1328	+	WANT_33BIT_ADDRESSING=yes
1329		fi
1330		elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1331		dnl SPARC CPU
#	Line 1084 | Line 1382 | else
1382		JITSRCS=""
1383		fi
1384
1385	+	dnl Use 33-bit memory addressing?
1386	+	if [[ "$ac_cv_have_33bit_addressing:$WANT_33BIT_ADDRESSING" = "yes:yes" ]]; then
1387	+	use_33bit_addressing=yes
1388	+	fi
1389	+	AC_TRANSLATE_DEFINE(USE_33BIT_ADDRESSING, "$use_33bit_addressing",
1390	+	[Define to use 33-bit memory addressing on 64-bit JIT capable systems.])
1391	+
1392		dnl Utility macro used by next two tests.
1393		dnl AC_EXAMINE_OBJECT(C source code,
1394		dnl     commands examining object file,

Diff Legend

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