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.53 by gbeauche, 2005-07-06T05:25:05Z vs.
Revision 1.82 by asvitkine, 2011-12-29T07:38:34Z

#	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	+	AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
18	+
19		dnl Video options.
20		AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
21		AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
#	Line 24 | Line 26 | dnl SDL options.
26		AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
27		AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
28		AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
29	+	AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
30	+	AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
31
32		dnl JIT compiler options.
33		AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
#	Line 70 | Line 74 | AC_ARG_WITH(gtk,             [  --with-g
74		[WANT_GTK="gtk2 gtk"])
75		AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
76
77	+	AC_ARG_WITH(bincue,
78	+	AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
79	+
80	+	AC_ARG_WITH(libvhd,
81	+	AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
82	+
83	+
84		dnl Canonical system information.
85		AC_CANONICAL_HOST
86		AC_CANONICAL_TARGET
#	Line 99 | Line 110 | case "$target_cpu" in
110		x86_64* ) HAVE_X86_64=yes;;
111		esac
112
113	+	dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
114	+	if [[ "x$HAVE_I386" = "xyes" ]]; then
115	+	AC_TRY_RUN([
116	+	int main(void) {
117	+	#if defined(__x86_64__)
118	+	return 0;
119	+	#else
120	+	return 1;
121	+	#endif
122	+	}
123	+	], [
124	+	HAVE_I386=no
125	+	HAVE_X86_64=yes
126	+	])
127	+	fi
128	+
129		dnl Checks for programs.
130		AC_PROG_CC
131		AC_PROG_CC_C_O
#	Line 116 | Line 143 | if [[ "x$WANT_MON" = "xyes" ]]; then
143		if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
144		AC_MSG_RESULT(yes)
145		AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
146	<	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"
146	>	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 $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
147		CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
148		AC_CHECK_LIB(ncurses, tgetent, ,
149	<	AC_CHECK_LIB(termcap, tgetent, ,
150	<	AC_CHECK_LIB(termlib, tgetent, ,
151	<	AC_CHECK_LIB(terminfo, tgetent, ,
152	<	AC_CHECK_LIB(Hcurses, tgetent, ,
153	<	AC_CHECK_LIB(curses, tgetent))))))
149	>	[AC_CHECK_LIB(termcap, tgetent, ,
150	>	[AC_CHECK_LIB(termlib, tgetent, ,
151	>	[AC_CHECK_LIB(terminfo, tgetent, ,
152	>	[AC_CHECK_LIB(Hcurses, tgetent, ,
153	>	[AC_CHECK_LIB(curses, tgetent)])])])])])
154		AC_CHECK_LIB(readline, readline)
155		else
156		AC_MSG_RESULT(no)
#	Line 136 | Line 163 | dnl Checks for libraries.
163		AC_CHECK_LIB(posix4, sem_init)
164		AC_CHECK_LIB(rt, timer_create)
165		AC_CHECK_LIB(rt, shm_open)
166	+	AC_CHECK_LIB(m, cos)
167	+
168	+	dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
169	+	dnl AC_TRY_LINK uses main() but SDL needs main to take args,
170	+	dnl therefore main is undefined with #undef.
171	+	dnl Framework can be in an custom location.
172	+	AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
173	+	AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
174	+	AC_CACHE_CHECK([whether compiler supports framework $1],
175	+	ac_Framework, [
176	+	saved_LIBS="$LIBS"
177	+	LIBS="$LIBS -framework $1"
178	+	if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
179	+	if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
180	+	LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
181	+	fi
182	+	fi
183	+	saved_CPPFLAGS="$CPPFLAGS"
184	+	CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
185	+	AC_TRY_LINK(
186	+	[$2
187	+	#undef main], [],
188	+	[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
189	+	LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
190	+	)
191	+	])
192	+	AS_IF([test AS_VAR_GET(ac_Framework) = yes],
193	+	[AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
194	+	)
195	+	AS_VAR_POPDEF([ac_Framework])
196	+	])
197
198		dnl Do we need SDL?
199		WANT_SDL=no
#	Line 151 | Line 209 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
209		SDL_SUPPORT="$SDL_SUPPORT audio"
210		fi
211		if [[ "x$WANT_SDL" = "xyes" ]]; then
212	<	AC_PATH_PROG(sdl_config, "sdl-config")
213	<	if [[ -n "$sdl_config" ]]; then
156	<	case $target_os in
157	<	# Special treatment for Cygwin so that we can still use the POSIX layer
158	<	*cygwin*)
159	<	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
160	<	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
161	<	;;
162	<	*)
163	<	sdl_cflags=`$sdl_config --cflags`
164	<	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
165	<	sdl_libs=`$sdl_config --static-libs`
166	<	else
167	<	sdl_libs=`$sdl_config --libs`
168	<	fi
169	<	;;
170	<	esac
171	<	CFLAGS="$CFLAGS $sdl_cflags"
172	<	CXXFLAGS="$CXXFLAGS $sdl_cflags"
173	<	LIBS="$LIBS $sdl_libs"
212	>	if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
213	>	AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
214		else
215	<	WANT_SDL=no
215	>	ac_cv_framework_SDL=no
216	>	fi
217	>	if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
218	>	AC_PATH_PROG(sdl_config, "sdl-config")
219	>	if [[ -n "$sdl_config" ]]; then
220	>	case $target_os in
221	>	# Special treatment for Cygwin so that we can still use the POSIX layer
222	>	*cygwin*)
223	>	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
224	>	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
225	>	;;
226	>	*)
227	>	sdl_cflags=`$sdl_config --cflags`
228	>	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
229	>	sdl_libs=`$sdl_config --static-libs`
230	>	else
231	>	sdl_libs=`$sdl_config --libs`
232	>	fi
233	>	;;
234	>	esac
235	>	CFLAGS="$CFLAGS $sdl_cflags"
236	>	CXXFLAGS="$CXXFLAGS $sdl_cflags"
237	>	LIBS="$LIBS $sdl_libs"
238	>	else
239	>	WANT_SDL=no
240	>	fi
241		fi
242		SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
243		else
#	Line 190 | Line 255 | if [[ "x$WANT_SDL" = "xno" ]]; then
255		LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
256		fi
257
258	+	dnl BINCUE
259	+	AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
260	+	AS_IF([test  "x$have_bincue" = "xyes" ], [
261	+	if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
262	+	DEFINES="$DEFINES -DBINCUE"
263	+	else
264	+	AC_MSG_ERROR([You need SDL Audio to use BINCUE support.])
265	+	fi
266	+	])
267	+
268	+	dnl LIBVHD
269	+	AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
270	+	AS_IF([test  "x$have_libvhd" = "xyes" ], [
271	+	CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
272	+	LIBS="$LIBS -lvhd"
273	+	case $target_os in
274	+	linux*)
275	+	LIBS="$LIBS -luuid"
276	+	esac
277	+	AC_CHECK_LIB(vhd, vhd_open)
278	+	AC_CHECK_LIB(vhd, vhd_io_read)
279	+	AC_CHECK_LIB(vhd, vhd_io_write)
280	+	AC_CHECK_LIB(vhd, vhd_close)
281	+	])
282	+
283	+
284	+
285		dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
286		HAVE_PTHREADS=yes
287		AC_CHECK_LIB(pthread, pthread_create, , [
#	Line 250 | Line 342 | UISRCS=../dummy/prefs_editor_dummy.cpp
342		case "x$WANT_GTK" in
343		xgtk2*)
344		AM_PATH_GTK_2_0(1.3.15, [
345	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
346	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
255	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
256	<	LIBS="$LIBS $GTK_LIBS"
257	<	UISRCS=prefs_editor_gtk.cpp
345	>	GUI_CFLAGS="$GTK_CFLAGS"
346	>	GUI_LIBS="$GTK_LIBS"
347		WANT_GTK=gtk2
348		], [
349		case "x${WANT_GTK}x" in
#	Line 272 | Line 361 | xgtk2*)
361		esac
362		if [[ "x$WANT_GTK" = "xgtk" ]]; then
363		AM_PATH_GTK(1.2.0, [
364	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
365	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
277	<	LIBS="$LIBS $GTK_LIBS"
278	<	UISRCS=prefs_editor_gtk.cpp
364	>	GUI_CFLAGS="$GTK_CFLAGS"
365	>	GUI_LIBS="$GTK_LIBS"
366		dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
367		dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
368		dnl includes <libintl.h>
369		AM_GNU_GETTEXT
370		B2_PATH_GNOMEUI([
371		AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
372	<	CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
373	<	LIBS="$LIBS $GNOMEUI_LIBS"
372	>	GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
373	>	GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
374		], [])
375		], [
376		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
377		WANT_GTK=no
378		])
379		fi
380	+	if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
381	+	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
382	+	UISRCS=prefs_editor_gtk.cpp
383	+	fi
384	+	AC_SUBST(GUI_CFLAGS)
385	+	AC_SUBST(GUI_LIBS)
386	+
387	+	dnl Build external GUI if requested.
388	+	if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
389	+	WANT_STANDALONE_GUI=no
390	+	fi
391	+	if [[ "$WANT_GTK" = "no" ]]; then
392	+	WANT_STANDALONE_GUI=no
393	+	fi
394	+	AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
395
396		dnl We use ESD if possible.
397		if [[ "x$WANT_ESD" = "xyes" ]]; then
#	Line 399 | Line 501 | mips-sony-bsd|mips-sony-newsos4)
501		*-*-cygwin*)
502		no_dev_ptmx=1
503		;;
504	+	*-*-darwin*)
505	+	no_dev_ptmx=1
506	+	;;
507		esac
508
509		if test -z "$no_dev_ptmx" ; then
#	Line 417 | Line 522 | AC_CHECK_FILE([/dev/ptc],
522		have_dev_ptc=1
523		]
524		)
420	–
525		dnl (end of code from openssh-3.2.2p1 configure.ac)
526
527	+	dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
528	+	dnl doesn't work or is unimplemented. On these systems (mostly older
529	+	dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
530	+	AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
531	+	ac_cv_nonblocking_io, [
532	+	case "$host" in
533	+	*-*-osf*)
534	+	ac_cv_nonblocking_io=FIONBIO
535	+	;;
536	+	*-*-sunos4*)
537	+	ac_cv_nonblocking_io=FIONBIO
538	+	;;
539	+	*-*-ultrix*)
540	+	ac_cv_nonblocking_io=FIONBIO
541	+	;;
542	+	*)
543	+	ac_cv_nonblocking_io=O_NONBLOCK
544	+	;;
545	+	esac
546	+	])
547	+	if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
548	+	AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
549	+	fi
550	+
551	+	dnl Check whether compiler supports byte bit-fields
552	+	AC_CACHE_CHECK([whether compiler supports byte bit-fields],
553	+	ac_cv_have_byte_bitfields, [
554	+	AC_LANG_SAVE
555	+	AC_LANG_CPLUSPLUS
556	+	AC_TRY_RUN([
557	+	struct A {
558	+	unsigned char b1:4;
559	+	unsigned char b2:4;
560	+	unsigned char c;
561	+	unsigned short s;
562	+	unsigned char a[4];
563	+	};
564	+
565	+	int main(void) {
566	+	A a;
567	+	return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
568	+	}],
569	+	[ac_cv_have_byte_bitfields=yes],
570	+	[ac_cv_have_byte_bitfields=no],
571	+	dnl When cross-compiling, assume only GCC supports this
572	+	[if [[ "$GCC" = "yes" ]]; then
573	+	ac_cv_have_byte_bitfields="guessing yes"
574	+	else
575	+	ac_cv_have_byte_bitfields="guessing no"
576	+	fi]
577	+	)
578	+	AC_LANG_RESTORE
579	+	])
580
581		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
582		AC_DEFUN([AC_CHECK_FRAMEWORK], [
#	Line 429 | Line 586 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
586		saved_LIBS="$LIBS"
587		LIBS="$LIBS -framework $1"
588		AC_TRY_LINK(
589	<	[$2], [int main(void) { return 0; }],
589	>	[$2], [],
590		[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
591		)
592		])
#	Line 440 | Line 597 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
597		])
598
599		dnl Check for some MacOS X frameworks
600	+	AC_CHECK_FRAMEWORK(AppKit, [])
601		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
602		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
603		AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
#	Line 490 | Line 648 | solaris*)
648		DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
649		;;
650		irix*)
493	–	ETHERSRC=ether_unix.cpp
651		AUDIOSRC=Irix/audio_irix.cpp
652		EXTRASYSSRCS=Irix/unaligned.c
496	–	dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
497	–	DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
653		LIBS="$LIBS -laudio"
654		WANT_ESD=no
655
#	Line 504 | Line 659 | irix*)
659		CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
660		AC_MSG_CHECKING(if "-IPA" works)
661		dnl Do a test compile of an empty function
662	<	AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
662	>	AC_TRY_COMPILE([#if defined __GNUC__
663	>	# error GCC does not support IPA yet
664	>	#endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
665		CFLAGS="$ocflags"
666		;;
667		darwin*)
#	Line 513 | Line 670 | darwin*)
670		EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
671		fi
672		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
673	<	EXTFSSRC=../MacOSX/extfs_macosx.mm
673	>	EXTFSSRC=../MacOSX/extfs_macosx.cpp
674		fi
675		;;
676		cygwin*)
#	Line 523 | Line 680 | cygwin*)
680		esac
681
682		dnl Is the slirp library supported?
683	<	if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
683	>	case "$ac_cv_have_byte_bitfields" in
684	>	yes|"guessing yes")
685	>	CAN_SLIRP=yes
686	>	ETHERSRC=ether_unix.cpp
687	>	;;
688	>	esac
689	>	if [[ -n "$CAN_SLIRP" ]]; then
690		AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
691		SLIRP_SRCS="\
692		../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
#	Line 538 | Line 701 | AC_SUBST(SLIRP_SRCS)
701		dnl SDL overrides
702		if [[ "x$WANT_SDL" = "xyes" ]]; then
703		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
704	+	if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
705	+	EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
706	+	fi
707		fi
708		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
709		AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
#	Line 545 | Line 711 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
711		KEYCODES="../SDL/keycodes"
712		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
713		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
714	+	EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
715	+	CPPFLAGS="$CPPFLAGS -I../MacOSX"
716		else
717		case "$target_os" in
718		cygwin*)
#	Line 565 | Line 733 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
733		AUDIOSRC="../SDL/audio_sdl.cpp"
734		fi
735
736	+	dnl BINCUE overrides
737	+
738	+	if [[ "x$have_bincue" = "xyes" ]]; then
739	+	EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
740	+	fi
741	+
742	+	dnl libvhd overrides
743	+
744	+	if [[ "x$have_libvhd" = "xyes" ]]; then
745	+	EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
746	+	fi
747	+
748	+
749		dnl Use 68k CPU natively?
750		WANT_NATIVE_M68K=no
751		if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
#	Line 797 | Line 978 | AC_CACHE_CHECK([whether we can map Low M
978		]
979		)
980
800	–	dnl Check if we have POSIX shared memory support
801	–	AC_CACHE_CHECK([whether POSIX shared memory is working],
802	–	ac_cv_have_posix_shm, [
803	–	AC_LANG_SAVE
804	–	AC_LANG_CPLUSPLUS
805	–	AC_TRY_RUN([
806	–	#define HAVE_POSIX_SHM
807	–	#include "vm_alloc.cpp"
808	–	int main(void) { /* returns 0 if we have working POSIX shm */
809	–	if (vm_init() < 0) exit(2);
810	–	char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
811	–	if (m1 == VM_MAP_FAILED) exit(3);
812	–	vm_exit(); exit(0);
813	–	}
814	–	], ac_cv_have_posix_shm=yes, ac_cv_have_posix_shm=no,
815	–	dnl When cross-compiling, do not assume anything.
816	–	ac_cv_have_posix_shm="guessing no"
817	–	)
818	–	AC_LANG_RESTORE
819	–	]
820	–	)
821	–	AC_TRANSLATE_DEFINE(HAVE_POSIX_SHM, "$ac_cv_have_posix_shm",
822	–	[Define if your system supports POSIX shared memory.])
823	–
824	–	dnl Check if we have working 33-bit memory addressing
825	–	AC_CACHE_CHECK([whether 33-bit memory addressing is working],
826	–	ac_cv_have_33bit_addressing, [
827	–	AC_LANG_SAVE
828	–	AC_LANG_CPLUSPLUS
829	–	AC_TRY_RUN([
830	–	#define USE_33BIT_ADDRESSING 1
831	–	#include "vm_alloc.cpp"
832	–	int main(void) { /* returns 0 if we have working 33-bit addressing */
833	–	if (sizeof(void *) < 8) exit(1);
834	–	if (vm_init() < 0) exit(2);
835	–	char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
836	–	if (m1 == VM_MAP_FAILED) exit(3);
837	–	char *m2 = m1 + (1L << 32);
838	–	m1[0] = 0x12; if (m2[0] != 0x12) exit(4);
839	–	m2[0] = 0x34; if (m1[0] != 0x34) exit(5);
840	–	vm_exit(); exit(0);
841	–	}
842	–	], ac_cv_have_33bit_addressing=yes, ac_cv_have_33bit_addressing=no,
843	–	dnl When cross-compiling, do not assume anything.
844	–	ac_cv_have_33bit_addressing="guessing no"
845	–	)
846	–	AC_LANG_RESTORE
847	–	]
848	–	)
849	–
981		dnl Check signal handlers need to be reinstalled
982		AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
983		ac_cv_signal_need_reinstall, [
#	Line 914 | Line 1045 | AC_CACHE_CHECK([whether your system supp
1045		AC_LANG_SAVE
1046		AC_LANG_CPLUSPLUS
1047		AC_TRY_RUN([
1048	+	#define HAVE_UNISTD_H 1
1049	+	#define HAVE_MACH_VM 1
1050	+	#define HAVE_MACH_TASK_SELF 1
1051		#define HAVE_MACH_EXCEPTIONS 1
1052		#define CONFIGURE_TEST_SIGSEGV_RECOVERY
1053		#include "vm_alloc.cpp"
#	Line 1036 | Line 1170 | fi
1170		dnl A dummy program that returns always true
1171		AC_PATH_PROG([BLESS], "true")
1172
1173	+	dnl Check for linker script support
1174	+	case $target_os:$target_cpu in
1175	+	linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1176	+	linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1177	+	linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1178	+	netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1179	+	freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1180	+	darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1181	+	esac
1182	+	if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1183	+	AC_CACHE_CHECK([whether linker script is usable],
1184	+	ac_cv_linker_script_works, [
1185	+	AC_LANG_SAVE
1186	+	AC_LANG_CPLUSPLUS
1187	+	saved_LDFLAGS="$LDFLAGS"
1188	+	LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1189	+	AC_TRY_RUN(
1190	+	[int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1191	+	[ac_cv_linker_script_works=yes],
1192	+	[ac_cv_linker_script_works=no],
1193	+	dnl When cross-compiling, assume it works
1194	+	[ac_cv_linker_script_works="guessing yes"]
1195	+	)
1196	+	AC_LANG_RESTORE
1197	+	if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1198	+	LDFLAGS="$saved_LDFLAGS"
1199	+	LINKER_SCRIPT_FLAGS=""
1200	+	fi
1201	+	])
1202	+	fi
1203	+	AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1204	+	[Define if there is a linker script to relocate the executable above 0x70000000.])
1205	+
1206		dnl Determine the addressing mode to use
1207		if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1208		ADDRESSING_MODE="real"
#	Line 1194 | Line 1361 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1361		CFLAGS="$SAVED_CFLAGS"
1362		fi
1363
1364	<	dnl Add -mdynamic-no-pic for MacOS X
1365	<	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1364	>	dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1365	>	if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1366		SAVED_CFLAGS="$CFLAGS"
1367		CFLAGS="$CFLAGS -mdynamic-no-pic"
1368		AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
#	Line 1235 | Line 1402 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1402		DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1403		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"
1404		CAN_JIT=yes
1238	–	WANT_33BIT_ADDRESSING=yes
1405		fi
1406		elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1407		dnl SPARC CPU
#	Line 1292 | Line 1458 | else
1458		JITSRCS=""
1459		fi
1460
1295	–	dnl Use 33-bit memory addressing?
1296	–	if [[ "$ac_cv_have_33bit_addressing:$WANT_33BIT_ADDRESSING" = "yes:yes" ]]; then
1297	–	use_33bit_addressing=yes
1298	–	fi
1299	–	AC_TRANSLATE_DEFINE(USE_33BIT_ADDRESSING, "$use_33bit_addressing",
1300	–	[Define to use 33-bit memory addressing on 64-bit JIT capable systems.])
1301	–
1461		dnl Utility macro used by next two tests.
1462		dnl AC_EXAMINE_OBJECT(C source code,
1463		dnl     commands examining object file,
#	Line 1523 | Line 1682 | echo
1682		echo Basilisk II configuration summary:
1683		echo
1684		echo SDL support ............................ : $SDL_SUPPORT
1685	+	echo BINCUE support ......................... : $have_bincue
1686	+	echo LIBVHD support ......................... : $have_libvhd
1687		echo XFree86 DGA support .................... : $WANT_XF86_DGA
1688		echo XFree86 VidMode support ................ : $WANT_XF86_VIDMODE
1689		echo fbdev DGA support ...................... : $WANT_FBDEV_DGA

Diff Legend

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