ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.49 by gbeauche, 2006-04-06T22:36:43Z vs.
Revision 1.59 by gbeauche, 2007-06-13T16:34:13Z

# Line 28 | 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 105 | 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 244 | 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 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
251 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 <    LIBS="$LIBS $GTK_LIBS"
252 <    UISRCS=prefs_editor_gtk.cpp
250 >    GUI_CFLAGS="$GTK_CFLAGS"
251 >    GUI_LIBS="$GTK_LIBS"
252      WANT_GTK=gtk2
253    ], [
254      case "x${WANT_GTK}x" in
# Line 260 | 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 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
271 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
272 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
273 <    LIBS="$LIBS $GTK_LIBS"
274 <    UISRCS=prefs_editor_gtk.cpp
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.])
277 –    WANT_GTK=no
275    ])
276   fi
277 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
278 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
279 +  UISRCS=prefs_editor_gtk.cpp
280 + fi
281 + AC_SUBST(GUI_CFLAGS)
282 + AC_SUBST(GUI_LIBS)
283 +
284 + dnl Build external GUI if requested.
285 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
286 +  WANT_STANDALONE_GUI=no
287 + fi
288 + if [[ "$WANT_GTK" = "no" ]]; then
289 +  WANT_STANDALONE_GUI=no
290 + fi
291 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
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.])
290 –    WANT_ESD=no
304    ])
305   fi
306  
# Line 508 | Line 521 | dnl Check for some MacOS X frameworks
521   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
522   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
523   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
524 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
525 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
526 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
527  
528   dnl Select system-dependant sources.
529   SERIALSRC=serial_unix.cpp
# Line 545 | Line 561 | darwin*)
561    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
562      EXTFSSRC=../MacOSX/extfs_macosx.mm
563    fi
564 +  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
565 +    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
566 +  fi
567    ;;
568   irix*)
569    AUDIOSRC=Irix/audio_irix.cpp
# Line 1337 | Line 1356 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1356      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1357      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1358      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1359 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1359 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1360 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1361    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1362  
1363    dnl Enable JIT compiler, if possible
# Line 1404 | Line 1424 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1424        x*) have_dyngen_gcc3=yes ;;
1425        esac
1426        if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1427 <        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1427 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1428        else
1429          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1430        fi
# Line 1430 | Line 1450 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1450        CPUSRCS="\
1451          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1452          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1453 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1453 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1454 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1455      fi
1456    fi
1457    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1458   else
1459    WANT_JIT=no
1460   fi
1440 – if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1441 –  AC_CACHE_CHECK([whether static data regions are executable],
1442 –    ac_cv_have_static_data_exec, [
1443 –    AC_TRY_RUN([int main(void) {
1444 – #if defined(__powerpc__) || defined(__ppc__)
1445 –      static unsigned int p[8] = {0x4e800020,};
1446 –      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1447 –      asm volatile("sync" : : : "memory");
1448 –      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1449 –      asm volatile("sync" : : : "memory");
1450 –      asm volatile("isync" : : : "memory");
1451 –      ((void (*)(void))p)();
1452 –      return 0;
1453 – #endif
1454 –      return 1;
1455 –    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1456 –    dnl When cross-compiling, do not assume anything.
1457 –    ac_cv_have_static_data_exec=no
1458 –    )
1459 –  ])
1460 – else
1461 –  ac_cv_use_dyngen=no
1462 – fi
1463 – AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1464 –  [Define if your system marks static data pages as executable.])
1465 –
1461   if [[ "x$WANT_JIT" = "xyes" ]]; then
1462    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1463   fi
# Line 1475 | Line 1470 | if [[ "x$HAVE_IPA" = "xyes" ]]; then
1470    LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1471   fi
1472  
1473 + dnl Check for linker script support
1474 + case $target_os:$target_cpu in
1475 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1476 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1477 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1478 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1479 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1480 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1481 + esac
1482 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1483 +  AC_CACHE_CHECK([whether linker script is usable],
1484 +    ac_cv_linker_script_works, [
1485 +    AC_LANG_SAVE
1486 +    AC_LANG_CPLUSPLUS
1487 +    saved_LDFLAGS="$LDFLAGS"
1488 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1489 +    AC_TRY_RUN(
1490 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1491 +      [ac_cv_linker_script_works=yes],
1492 +      [ac_cv_linker_script_works=no],
1493 +      dnl When cross-compiling, assume it works
1494 +      [ac_cv_linker_script_works="guessing yes"]
1495 +    )
1496 +    AC_LANG_RESTORE
1497 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1498 +      LDFLAGS="$saved_LDFLAGS"
1499 +      LINKER_SCRIPT_FLAGS=""
1500 +    fi
1501 +  ])
1502 + fi
1503 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1504 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1505 +
1506   dnl Generate Makefile.
1507   AC_SUBST(PERL)
1508   AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])

Diff Legend

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