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.55 by gbeauche, 2006-07-16T12:47:38Z vs.
Revision 1.63 by asvitkine, 2009-02-11T19:22:16Z

#	Line 106 | Line 106 | if [[ "x$WANT_MON" = "xyes" ]]; then
106		if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
107		AC_MSG_RESULT(yes)
108		AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
109	<	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"
109	>	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"
110		CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
111		AC_CHECK_LIB(ncurses, tgetent, ,
112		AC_CHECK_LIB(termcap, tgetent, ,
#	Line 245 | Line 245 | dnl We use GTK+ if possible.
245		UISRCS=../dummy/prefs_editor_dummy.cpp
246		case "x$WANT_GTK" in
247		xgtk2*)
248	+	WANT_GTK=no
249		AM_PATH_GTK_2_0(1.3.15, [
250		GUI_CFLAGS="$GTK_CFLAGS"
251		GUI_LIBS="$GTK_LIBS"
#	Line 258 | Line 259 | xgtk2*)
259		*)
260		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261		WANT_GTK=no
262	<	;;
262	>	;;
263		esac
264		])
265		;;
266		esac
267		if [[ "x$WANT_GTK" = "xgtk" ]]; then
268	+	WANT_GTK=no
269		AM_PATH_GTK(1.2.0, [
270		GUI_CFLAGS="$GTK_CFLAGS"
271		GUI_LIBS="$GTK_LIBS"
272	+	WANT_GTK=gtk
273		], [
274		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272	–	WANT_GTK=no
275		])
276		fi
277		if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
#	Line 290 | Line 292 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
292
293		dnl We use ESD if possible.
294		if [[ "x$WANT_ESD" = "xyes" ]]; then
295	+	WANT_ESD=no
296		AM_PATH_ESD(0.2.8, [
297		AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
298		CFLAGS="$CFLAGS $ESD_CFLAGS"
299		CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
300		LIBS="$LIBS $ESD_LIBS"
301	+	WANT_ESD=yes
302		], [
303		AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300	–	WANT_ESD=no
304		])
305		fi
306
#	Line 422 | Line 425 | mips-sony-bsd|mips-sony-newsos4)
425		*-*-cygwin*)
426		no_dev_ptmx=1
427		;;
428	+	*-*-darwin*)
429	+	no_dev_ptmx=1
430	+	;;
431		esac
432
433		if test -z "$no_dev_ptmx" ; then
#	Line 518 | Line 524 | dnl Check for some MacOS X frameworks
524		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
525		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
526		AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
527	+	AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
528	+	AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
529	+	AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
530	+	AC_CHECK_FRAMEWORK(AppKit, [])
531
532		dnl Select system-dependant sources.
533		SERIALSRC=serial_unix.cpp
534		ETHERSRC=../dummy/ether_dummy.cpp
535		SCSISRC=../dummy/scsi_dummy.cpp
536		AUDIOSRC=../dummy/audio_dummy.cpp
537	+	PREFSSRC=../dummy/prefs_dummy.cpp
538		EXTFSSRC=extfs_unix.cpp
539		EXTRASYSSRCS=
540		case "$target_os" in
#	Line 553 | Line 564 | darwin*)
564		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
565		fi
566		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
567	<	EXTFSSRC=../MacOSX/extfs_macosx.mm
567	>	EXTFSSRC=../MacOSX/extfs_macosx.cpp
568	>	if [[ "x$ac_cv_framework_AppKit" = "xyes" ]]; then
569	>	PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
570	>	CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
571	>	fi
572	>	fi
573	>	if [[ "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
574	>	AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
575		fi
576		;;
577		irix*)
#	Line 616 | Line 634 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
634		AUDIOSRC="../SDL/audio_sdl.cpp"
635		fi
636
637	<	SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
637	>	SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
638
639		dnl Define a macro that translates a yesno-variable into a C macro definition
640		dnl to be put into the config.h file

Diff Legend

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