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.31 by gbeauche, 2005-07-01T06:16:00Z vs.
Revision 1.66 by asvitkine, 2009-08-18T03:27:50Z

#	Line 1 | Line 1
1		dnl Process this file with autoconf to produce a configure script.
2		dnl Written in 2002 by Christian Bauer
3
4	<	AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver)
4	>	AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver)
5		AC_CONFIG_SRCDIR(main_unix.cpp)
6		AC_PREREQ(2.52)
7		AC_CONFIG_HEADER(config.h)
#	Line 14 | Line 14 | dnl Some systems do not put corefiles in
14		dnl cores for the configure tests since some are intended to dump core.
15		ulimit -c 0
16
17	+	dnl Invite Cygwin users to build within the Windows/ directory
18	+	case $target_os in
19	+	*cygwin* | *mingw32*)
20	+	AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.])
21	+	;;
22	+	esac
23	+
24		dnl Options.
25		AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
26		AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
#	Line 21 | Line 28 | AC_ARG_ENABLE(fbdev-dga,    [  --enable-
28		AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29		AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30		AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31	+	AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32		AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33		AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34		[case "$withval" in
#	Line 48 | Line 56 | dnl SDL options.
56		AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
57		AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
58		AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
59	+	AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
60	+	AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
61
62		dnl Checks for programs.
63		AC_PROG_CC
#	Line 98 | Line 108 | if [[ "x$WANT_MON" = "xyes" ]]; then
108		if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
109		AC_MSG_RESULT(yes)
110		AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
111	<	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.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"
111	>	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.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 $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
112		CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
113		AC_CHECK_LIB(ncurses, tgetent, ,
114		AC_CHECK_LIB(termcap, tgetent, ,
#	Line 118 | Line 128 | AC_SUBST(MONSRCS)
128
129		dnl Checks for libraries.
130		AC_CHECK_LIB(posix4, sem_init)
131	+	AC_CHECK_LIB(m, cos)
132	+
133	+	dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
134	+	dnl AC_TRY_LINK uses main() but SDL needs main to take args,
135	+	dnl therefore main is undefined with #undef.
136	+	dnl Framework can be in an custom location.
137	+	AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
138	+	AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
139	+	AC_CACHE_CHECK([whether compiler supports framework $1],
140	+	ac_Framework, [
141	+	saved_LIBS="$LIBS"
142	+	LIBS="$LIBS -framework $1"
143	+	if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
144	+	if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
145	+	LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
146	+	fi
147	+	fi
148	+	saved_CPPFLAGS="$CPPFLAGS"
149	+	CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
150	+	AC_TRY_LINK(
151	+	[$2
152	+	#undef main], [],
153	+	[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
154	+	LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
155	+	)
156	+	])
157	+	AS_IF([test AS_VAR_GET(ac_Framework) = yes],
158	+	[AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
159	+	)
160	+	AS_VAR_POPDEF([ac_Framework])
161	+	])
162
163		dnl Do we need SDL?
164		WANT_SDL=no
#	Line 133 | Line 174 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
174		SDL_SUPPORT="$SDL_SUPPORT audio"
175		fi
176		if [[ "x$WANT_SDL" = "xyes" ]]; then
177	<	AC_PATH_PROG(sdl_config, "sdl-config")
178	<	if [[ -n "$sdl_config" ]]; then
179	<	case $target_os in
180	<	# Special treatment for Cygwin so that we can still use the POSIX layer
181	<	*cygwin*)
182	<	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
183	<	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
184	<	;;
144	<	*)
177	>	if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
178	>	AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
179	>	else
180	>	ac_cv_framework_SDL=no
181	>	fi
182	>	if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
183	>	AC_PATH_PROG(sdl_config, "sdl-config")
184	>	if [[ -n "$sdl_config" ]]; then
185		sdl_cflags=`$sdl_config --cflags`
186		if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
187		sdl_libs=`$sdl_config --static-libs`
188		else
189		sdl_libs=`$sdl_config --libs`
190		fi
191	<	;;
192	<	esac
193	<	CFLAGS="$CFLAGS $sdl_cflags"
194	<	CXXFLAGS="$CXXFLAGS $sdl_cflags"
195	<	LIBS="$LIBS $sdl_libs"
196	<	else
197	<	WANT_SDL=no
198	<	WANT_SDL_VIDEO=no
159	<	WANT_SDL_AUDIO=no
191	>	CFLAGS="$CFLAGS $sdl_cflags"
192	>	CXXFLAGS="$CXXFLAGS $sdl_cflags"
193	>	LIBS="$LIBS $sdl_libs"
194	>	else
195	>	WANT_SDL=no
196	>	WANT_SDL_VIDEO=no
197	>	WANT_SDL_AUDIO=no
198	>	fi
199		fi
200		SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
201		else
#	Line 192 | Line 231 | no:linux*|no:netbsd*)
231		])
232		])
233		AC_CHECK_FUNCS(pthread_cancel)
234	<	AC_CHECK_FUNCS(pthread_cond_init)
234	>	AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
235		AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
236		AC_CHECK_FUNCS(pthread_mutexattr_settype)
237		AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
#	Line 245 | Line 284 | dnl We use GTK+ if possible.
284		UISRCS=../dummy/prefs_editor_dummy.cpp
285		case "x$WANT_GTK" in
286		xgtk2*)
287	+	WANT_GTK=no
288		AM_PATH_GTK_2_0(1.3.15, [
289	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
290	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
251	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
252	<	LIBS="$LIBS $GTK_LIBS"
253	<	UISRCS=prefs_editor_gtk.cpp
289	>	GUI_CFLAGS="$GTK_CFLAGS"
290	>	GUI_LIBS="$GTK_LIBS"
291		WANT_GTK=gtk2
292		], [
293		case "x${WANT_GTK}x" in
#	Line 261 | Line 298 | xgtk2*)
298		*)
299		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
300		WANT_GTK=no
301	<	;;
301	>	;;
302		esac
303		])
304		;;
305		esac
306		if [[ "x$WANT_GTK" = "xgtk" ]]; then
307	+	WANT_GTK=no
308		AM_PATH_GTK(1.2.0, [
309	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
310	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
311	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
274	<	LIBS="$LIBS $GTK_LIBS"
275	<	UISRCS=prefs_editor_gtk.cpp
309	>	GUI_CFLAGS="$GTK_CFLAGS"
310	>	GUI_LIBS="$GTK_LIBS"
311	>	WANT_GTK=gtk
312		], [
313		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
278	–	WANT_GTK=no
314		])
315		fi
316	+	if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
317	+	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
318	+	UISRCS=prefs_editor_gtk.cpp
319	+	fi
320	+	AC_SUBST(GUI_CFLAGS)
321	+	AC_SUBST(GUI_LIBS)
322	+
323	+	dnl Build external GUI if requested.
324	+	if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
325	+	WANT_STANDALONE_GUI=no
326	+	fi
327	+	if [[ "$WANT_GTK" = "no" ]]; then
328	+	WANT_STANDALONE_GUI=no
329	+	fi
330	+	AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
331
332		dnl We use ESD if possible.
333		if [[ "x$WANT_ESD" = "xyes" ]]; then
334	+	WANT_ESD=no
335		AM_PATH_ESD(0.2.8, [
336		AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
337		CFLAGS="$CFLAGS $ESD_CFLAGS"
338		CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
339		LIBS="$LIBS $ESD_LIBS"
340	+	WANT_ESD=yes
341		], [
342		AC_MSG_WARN([Could not find ESD, disabling ESD support.])
291	–	WANT_ESD=no
343		])
344		fi
345
#	Line 300 | Line 351 | AC_HEADER_STDC
351		AC_HEADER_SYS_WAIT
352		AC_CHECK_HEADERS(malloc.h stdint.h)
353		AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
303	–	AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
354		AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
355	<	AC_CHECK_HEADERS(linux/if.h, [], [], [
356	<	#if HAVE_SYS_SOCKET_H
357	<	# include <sys/socket.h>
355	>	AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
356	>	AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
357	>	AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
358	>	#ifdef HAVE_SYS_TYPES_H
359	>	#include <sys/types.h>
360	>	#endif
361	>	#ifdef HAVE_SYS_SOCKET_H
362	>	#include <sys/socket.h>
363		#endif
364		])
365	<	AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
365	>	AC_CHECK_HEADERS(AvailabilityMacros.h)
366	>	AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
367		AC_CHECK_HEADERS(fenv.h)
368
369		dnl Checks for typedefs, structures, and compiler characteristics.
#	Line 328 | Line 384 | AC_TYPE_SIGNAL
384		AC_HEADER_TIME
385		AC_STRUCT_TM
386
387	+	dnl Check whether sys/socket.h defines type socklen_t.
388	+	dnl (extracted from ac-archive/Miscellaneous)
389	+	AC_CACHE_CHECK([for socklen_t],
390	+	ac_cv_type_socklen_t, [
391	+	AC_TRY_COMPILE([
392	+	#include <sys/types.h>
393	+	#include <sys/socket.h>
394	+	], [socklen_t len = 42; return 0;],
395	+	ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
396	+	dnl When cross-compiling, do not assume anything.
397	+	ac_cv_type_socklen_t="guessing no"
398	+	)
399	+	])
400	+	if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
401	+	AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
402	+	fi
403	+
404		dnl Check whether struct sigaction has sa_restorer member.
405		AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
406		ac_cv_signal_sa_restorer, [
#	Line 344 | Line 417 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
417		fi
418
419		dnl Checks for library functions.
420	<	AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
420	>	AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
421		AC_CHECK_FUNCS(nanosleep)
422		AC_CHECK_FUNCS(sigaction signal)
423		AC_CHECK_FUNCS(mmap mprotect munmap)
424		AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
425		AC_CHECK_FUNCS(exp2f log2f exp2 log2)
426		AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
427	+	AC_CHECK_FUNCS(poll inet_aton)
428
429		dnl Darwin seems to define mach_task_self() instead of task_self().
430		AC_CHECK_FUNCS(mach_task_self task_self)
#	Line 390 | Line 464 | mips-sony-bsd|mips-sony-newsos4)
464		*-*-cygwin*)
465		no_dev_ptmx=1
466		;;
467	+	*-*-darwin*)
468	+	no_dev_ptmx=1
469	+	;;
470		esac
471
472		if test -z "$no_dev_ptmx" ; then
#	Line 410 | Line 487 | AC_CHECK_FILE([/dev/ptc],
487		)
488		dnl (end of code from openssh-3.2.2p1 configure.ac)
489
490	+	dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
491	+	dnl doesn't work or is unimplemented. On these systems (mostly older
492	+	dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
493	+	AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
494	+	ac_cv_nonblocking_io, [
495	+	case "$host" in
496	+	*-*-osf*)
497	+	ac_cv_nonblocking_io=FIONBIO
498	+	;;
499	+	*-*-sunos4*)
500	+	ac_cv_nonblocking_io=FIONBIO
501	+	;;
502	+	*-*-ultrix*)
503	+	ac_cv_nonblocking_io=FIONBIO
504	+	;;
505	+	*)
506	+	ac_cv_nonblocking_io=O_NONBLOCK
507	+	;;
508	+	esac
509	+	])
510	+	if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
511	+	AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
512	+	fi
513	+
514	+	dnl Check whether compiler supports byte bit-fields
515	+	AC_CACHE_CHECK([whether compiler supports byte bit-fields],
516	+	ac_cv_have_byte_bitfields, [
517	+	AC_LANG_SAVE
518	+	AC_LANG_CPLUSPLUS
519	+	AC_TRY_RUN([
520	+	struct A {
521	+	unsigned char b1:4;
522	+	unsigned char b2:4;
523	+	unsigned char c;
524	+	unsigned short s;
525	+	unsigned char a[4];
526	+	};
527	+
528	+	int main(void) {
529	+	A a;
530	+	return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
531	+	}],
532	+	[ac_cv_have_byte_bitfields=yes],
533	+	[ac_cv_have_byte_bitfields=no],
534	+	dnl When cross-compiling, assume only GCC supports this
535	+	[if [[ "$GCC" = "yes" ]]; then
536	+	ac_cv_have_byte_bitfields="guessing yes"
537	+	else
538	+	ac_cv_have_byte_bitfields="guessing no"
539	+	fi]
540	+	)
541	+	AC_LANG_RESTORE
542	+	])
543	+
544		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
545	<	AC_DEFUN(AC_CHECK_FRAMEWORK, [
545	>	AC_DEFUN([AC_CHECK_FRAMEWORK], [
546		AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
547		AC_CACHE_CHECK([whether compiler supports framework $1],
548		ac_Framework, [
549		saved_LIBS="$LIBS"
550		LIBS="$LIBS -framework $1"
551		AC_TRY_LINK(
552	<	[$2], [int main(void) { return 0; }],
552	>	[$2], [],
553		[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
554		)
555		])
#	Line 431 | Line 562 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
562		dnl Check for some MacOS X frameworks
563		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
564		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
565	+	AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
566	+	AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
567	+	AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
568	+	AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
569	+	AC_CHECK_FRAMEWORK(AppKit, [])
570
571		dnl Select system-dependant sources.
572		SERIALSRC=serial_unix.cpp
573		ETHERSRC=../dummy/ether_dummy.cpp
574		SCSISRC=../dummy/scsi_dummy.cpp
575		AUDIOSRC=../dummy/audio_dummy.cpp
576	+	PREFSSRC=../dummy/prefs_dummy.cpp
577		EXTFSSRC=extfs_unix.cpp
578		EXTRASYSSRCS=
579		case "$target_os" in
580		linux*)
581	<	ETHERSRC=Linux/ether_linux.cpp
581	>	ETHERSRC=ether_unix.cpp
582		AUDIOSRC=audio_oss_esd.cpp
583		SCSISRC=Linux/scsi_linux.cpp
584		if [[ "x$EMULATED_PPC" = "xno" ]]; then
585	<	EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
585	>	EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
586		fi
587		;;
588	+	freebsd*)
589	+	ETHERSRC=ether_unix.cpp
590	+	;;
591		netbsd*)
592	+	ETHERSRC=ether_unix.cpp
593		if [[ "x$EMULATED_PPC" = "xno" ]]; then
594	<	EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
594	>	EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
595		fi
596		;;
597		darwin*)
598	+	ETHERSRC=ether_unix.cpp
599		if [[ "x$EMULATED_PPC" = "xno" ]]; then
600	<	EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
600	>	EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
601		fi
602	<	if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
602	>	if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
603		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
604		fi
605		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
606	<	EXTFSSRC=../MacOSX/extfs_macosx.mm
606	>	EXTFSSRC=../MacOSX/extfs_macosx.cpp
607	>	if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
608	>	PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
609	>	CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
610	>	fi
611		fi
612	+	if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
613	+	AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
614	+	fi
615	+	;;
616	+	irix*)
617	+	AUDIOSRC=Irix/audio_irix.cpp
618	+	LIBS="$LIBS -laudio"
619	+	WANT_ESD=no
620	+
621	+	dnl Check if our compiler supports -IPA (MIPSPro)
622	+	HAVE_IPA=no
623	+	ocflags="$CFLAGS"
624	+	CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
625	+	AC_MSG_CHECKING(if "-IPA" works)
626	+	dnl Do a test compile of an empty function
627	+	AC_TRY_COMPILE([#if defined __GNUC__
628	+	# error GCC does not support IPA yet
629	+	#endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
630	+	CFLAGS="$ocflags"
631		;;
632	<	cygwin*)
633	<	SERIALSRC="../dummy/serial_dummy.cpp"
632	>	esac
633	>
634	>	dnl Is the slirp library supported?
635	>	case "$ac_cv_have_byte_bitfields" in
636	>	yes|"guessing yes")
637	>	CAN_SLIRP=yes
638	>	ETHERSRC=ether_unix.cpp
639		;;
640		esac
641	+	if [[ -n "$CAN_SLIRP" ]]; then
642	+	AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
643	+	SLIRP_SRCS="\
644	+	../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
645	+	../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
646	+	../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
647	+	../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
648	+	../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
649	+	../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
650	+	fi
651	+	AC_SUBST(SLIRP_SRCS)
652
653		dnl SDL overrides
654		if [[ "x$WANT_SDL" = "xyes" ]]; then
655		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
656	+	if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
657	+	EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
658	+	fi
659		fi
660		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
661		AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
#	Line 480 | Line 664 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
664		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
665		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
666		else
667	<	case "$target_os" in
484	<	cygwin*)
485	<	EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
486	<	;;
487	<	*)
488	<	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
489	<	;;
490	<	esac
667	>	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
668		fi
669		else
670		VIDEOSRCS="video_x.cpp"
#	Line 499 | Line 676 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
676		AUDIOSRC="../SDL/audio_sdl.cpp"
677		fi
678
679	<	SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
679	>	SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
680
681		dnl Define a macro that translates a yesno-variable into a C macro definition
682		dnl to be put into the config.h file
683		dnl $1 -- the macro to define
684		dnl $2 -- the value to translate
685		dnl $3 -- template name
686	<	AC_DEFUN(AC_TRANSLATE_DEFINE, [
686	>	AC_DEFUN([AC_TRANSLATE_DEFINE], [
687		if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
688		AC_DEFINE($1, 1, $3)
689		fi
#	Line 915 | Line 1092 | fi
1092
1093		dnl Check addressing mode to use
1094		AC_MSG_CHECKING([for addressing mode to use])
918	–	case "$os_target" in
919	–	cygwin*)
920	–	WANT_ADDRESSING_MODE="direct,cygwin-hack"
921	–	NATMEM_OFFSET=
922	–	;;
923	–	esac
1095		if [[ "$EMULATED_PPC" != "yes" ]]; then
1096		if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
1097		AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
#	Line 1152 | Line 1323 | fi
1323		dnl Check for GCC 2.7 or higher.
1324		HAVE_GCC27=no
1325		AC_MSG_CHECKING(for GCC 2.7 or higher)
1326	<	AC_EGREP_CPP(xyes,
1327	<	[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1328	<	xyes
1329	<	#endif
1330	<	], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1326	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1327	>	# error gcc < 2.7
1328	>	typedef syntax error;
1329	>	#endif
1330	>	]])],
1331	>	[AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1332	>	[AC_MSG_RESULT(no)])
1333
1334		dnl Check for GCC 3.0 or higher.
1335		HAVE_GCC30=no
1336		AC_MSG_CHECKING(for GCC 3.0 or higher)
1337	<	AC_EGREP_CPP(xyes,
1338	<	[#if __GNUC__ >= 3
1339	<	xyes
1340	<	#endif
1341	<	], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1337	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1338	>	# error gcc < 3
1339	>	typedef syntax error;
1340	>	#endif
1341	>	]])],
1342	>	[AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1343	>	[AC_MSG_RESULT(no)])
1344
1345		dnl Check for ICC.
1346		AC_MSG_CHECKING(for ICC)
#	Line 1196 | Line 1371 | AC_CACHE_CHECK([the format of compiler g
1371		rm -rf conftest*
1372		])
1373
1374	<	dnl Add -mdynamic-no-pic for MacOS X
1374	>	dnl Add -fno-strict-aliasing for slirp sources
1375		if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1376		SAVED_CFLAGS="$CFLAGS"
1377	+	CFLAGS="$CFLAGS -fno-strict-aliasing"
1378	+	AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1379	+	ac_cv_gcc_no_strict_aliasing, [
1380	+	AC_TRY_COMPILE([],[],
1381	+	[ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1382	+	[ac_cv_gcc_no_strict_aliasing=no])
1383	+	])
1384	+	CFLAGS="$SAVED_CFLAGS"
1385	+	fi
1386	+
1387	+	dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1388	+	if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1389	+	SAVED_CFLAGS="$CFLAGS"
1390		CFLAGS="$CFLAGS -mdynamic-no-pic"
1391		AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1392		ac_cv_gcc_mdynamic_no_pic, [
#	Line 1219 | Line 1407 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1407		../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1408		../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1409		../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1410	<	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1410	>	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1411	>	../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1412		CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1413
1414		dnl Enable JIT compiler, if possible
#	Line 1236 | Line 1425 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1425		i?86:elf)
1426		ac_cv_use_dyngen=yes
1427		;;
1428	+	mips:elf)
1429	+	ac_cv_use_dyngen=yes
1430	+	;;
1431		powerpc:mach)
1432		ac_cv_use_dyngen=yes
1433		;;
1434	+	i?86:mach)
1435	+	ac_cv_use_dyngen=yes
1436	+	;;
1437		*:*)
1438		ac_cv_use_dyngen=no
1439		;;
#	Line 1248 | Line 1443 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1443		if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1444		DYNGEN_CC=$CXX
1445		else
1446	<	for p in /usr/bin /usr/local/bin; do
1446	>	for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1447		gxx="$p/g++"
1448		if [[ -x "$gxx" ]]; then
1449		DYNGEN_CC="$gxx"
#	Line 1263 | Line 1458 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1458		if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1459		case $host_cpu in
1460		i?86)
1461	<	DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1461	>	DYNGEN_OP_FLAGS="-fomit-frame-pointer"
1462	>	;;
1463	>	mips)
1464	>	DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1465		;;
1466		powerpc)
1467		if [[ "x$ac_cv_object_format" = "xmach" ]]; then
#	Line 1271 | Line 1469 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1469		fi
1470		;;
1471		esac
1472	<	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1473	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1472	>	have_dyngen_gcc3=no
1473	>	case "x`$DYNGEN_CC -dumpversion`" in
1474	>	x[12].*) ;;
1475	>	x*) have_dyngen_gcc3=yes ;;
1476	>	esac
1477	>	if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1478	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1479		else
1480		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1481		fi
1482	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1483	<	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1482	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1483	>	if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1484		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1485		fi
1486	+	if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1487	+	DYNGEN_CFLAGS="-O2 $CFLAGS"
1488	+	DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1489	+	else
1490	+	DYNGEN_CFLAGS="\$(CFLAGS)"
1491	+	DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1492	+	fi
1493		else
1494		WANT_JIT=no
1495		fi
#	Line 1291 | Line 1501 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1501		CPUSRCS="\
1502		../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1503		../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1504	<	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1504	>	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1505	>	../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1506		fi
1507		fi
1508		CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1509		else
1510		WANT_JIT=no
1511		fi
1301	–	if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1302	–	AC_CACHE_CHECK([whether static data regions are executable],
1303	–	ac_cv_have_static_data_exec, [
1304	–	AC_TRY_RUN([int main(void) {
1305	–	#if defined(__powerpc__) || defined(__ppc__)
1306	–	static unsigned int p[8] = {0x4e800020,};
1307	–	asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1308	–	asm volatile("sync" : : : "memory");
1309	–	asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1310	–	asm volatile("sync" : : : "memory");
1311	–	asm volatile("isync" : : : "memory");
1312	–	((void (*)(void))p)();
1313	–	return 0;
1314	–	#endif
1315	–	return 1;
1316	–	}], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1317	–	dnl When cross-compiling, do not assume anything.
1318	–	ac_cv_have_static_data_exec=no
1319	–	)
1320	–	])
1321	–	else
1322	–	ac_cv_use_dyngen=no
1323	–	fi
1324	–	AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1325	–	[Define if your system marks static data pages as executable.])
1326	–
1512		if [[ "x$WANT_JIT" = "xyes" ]]; then
1513		CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1514		fi
1515
1516	+	dnl Higher level optimizations with MIPSPro compilers are possible
1517	+	if [[ "x$HAVE_IPA" = "xyes" ]]; then
1518	+	CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1519	+	CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1520	+	CXXFLAGS="-LANG:std $CXXFLAGS"
1521	+	LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1522	+	fi
1523	+
1524	+	dnl Check for linker script support
1525	+	case $target_os:$target_cpu in
1526	+	linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1527	+	linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1528	+	linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1529	+	netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1530	+	freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1531	+	darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1532	+	esac
1533	+	if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1534	+	AC_CACHE_CHECK([whether linker script is usable],
1535	+	ac_cv_linker_script_works, [
1536	+	AC_LANG_SAVE
1537	+	AC_LANG_CPLUSPLUS
1538	+	saved_LDFLAGS="$LDFLAGS"
1539	+	LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1540	+	AC_TRY_RUN(
1541	+	[int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1542	+	[ac_cv_linker_script_works=yes],
1543	+	[ac_cv_linker_script_works=no],
1544	+	dnl When cross-compiling, assume it works
1545	+	[ac_cv_linker_script_works="guessing yes"]
1546	+	)
1547	+	AC_LANG_RESTORE
1548	+	if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1549	+	LDFLAGS="$saved_LDFLAGS"
1550	+	LINKER_SCRIPT_FLAGS=""
1551	+	fi
1552	+	])
1553	+	fi
1554	+	AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1555	+	[Define if there is a linker script to relocate the executable above 0x70000000.])
1556	+
1557		dnl Generate Makefile.
1558		AC_SUBST(PERL)
1559		AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1560		AC_SUBST(DYNGENSRCS)
1561		AC_SUBST(DYNGEN_CC)
1562	+	AC_SUBST(DYNGEN_CFLAGS)
1563	+	AC_SUBST(DYNGEN_CXXFLAGS)
1564		AC_SUBST(DYNGEN_OP_FLAGS)
1565		AC_SUBST(SYSSRCS)
1566		AC_SUBST(CPUSRCS)

Diff Legend

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