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

Comparing BasiliskII/src/Unix/configure.in (file contents):
Revision 1.28 by cebix, 2000-10-14T16:30:53Z vs.
Revision 1.32 by gbeauche, 2001-01-28T14:04:32Z

# Line 10 | Line 10 | AC_ARG_ENABLE(xf86-dga,      [  --enable
10   AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
11   AC_ARG_ENABLE(fbdev-dga,     [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
12   AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
13 < AC_ARG_ENABLE(16bit-vidmode, [  --enable-16bit-vidmode  enable 16-bit video if possible [default=yes]], [WANT_16BIT_VIDMODE=$enableval], [WANT_16BIT_VIDMODE=yes])
13 >
14 > dnl Addressing modes.
15   AC_ARG_ENABLE(addressing,
16 < [  --enable-addressing=mode specify the addressing mode to use [default=fastest]],
16 > [  --enable-addressing=AM  specify the addressing mode to use [default=fastest]],
17   [ case "$enableval" in
18      real)       ADDRESSING_TEST_ORDER="real";;
19      direct)     ADDRESSING_TEST_ORDER="direct";;
20      banks)      ADDRESSING_TEST_ORDER="banks";;
21 < dnl fastest)    ADDRESSING_TEST_ORDER="real direct banks";; gb-- will enable later...
22 <    fastest)    ADDRESSING_TEST_ORDER="direct banks";;
22 <    *)          AC_MSG_ERROR([--enable-mem-addressing takes only one of the following values: fastest, real, direct, banks]);;
21 >    fastest)ADDRESSING_TEST_ORDER="direct banks";;
22 >    *)          AC_MSG_ERROR([--enable-addressing takes only one of the following values: fastest, real, direct, banks]);;
23    esac
24   ],
25 – dnl [ ADDRESSING_TEST_ORDER="real direct banks" gb-- will probably reactivate later
25   [ ADDRESSING_TEST_ORDER="direct banks"
26   ])
27 +
28 + dnl External packages.
29   AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
30   AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
31   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
# Line 71 | Line 72 | if [[ "x$WANT_MON" = "xyes" ]]; then
72    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
73      AC_MSG_RESULT(yes)
74      AC_DEFINE(ENABLE_MON)
75 <    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_8080.cpp $mon_srcdir/mon_cmd.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"
75 >    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/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
76      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
77      AC_CHECK_LIB(readline, readline)
78      AC_CHECK_LIB(termcap, tputs)
# Line 259 | Line 260 | solaris*)
260    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
261    ;;
262   irix*)
263 +  AUDIOSRC=Irix/audio_irix.cpp
264    EXTRASYSSRCS=Irix/unaligned.c
265    dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
266    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
267 <  LIBS="$LIBS -lm"
267 >  LIBS="$LIBS -laudio"
268    ;;
269   esac
270  
# Line 450 | Line 452 | else
452    for am in $ADDRESSING_TEST_ORDER; do
453      case $am in
454      real)
455 <      dnl Requires ability to mmap Low Memory globals.
455 >      dnl Requires ability to mmap() Low Memory globals
456        if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
457          continue
458        fi
459 <      if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
460 <        dnl Requires only VOSF if 16-bit vidmode enable
461 <        if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
460 <          if [[ "x$CAN_VOSF" = "xno" ]]; then
461 <            continue
462 <          fi
463 <        else
464 <          DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
465 <        fi
466 <      else
467 <        dnl Requires VOSF
468 <        if [[ "x$CAN_VOSF" = "xno" ]]; then
469 <          continue
470 <        fi
459 >          dnl Requires VOSF screen updates
460 >      if [[ "x$CAN_VOSF" = "xno" ]]; then
461 >        continue
462        fi
463 <      dnl Real addressing will probably work
463 >      dnl Real addressing will probably work.
464        ADDRESSING_MODE="real"
465        WANT_VOSF=yes dnl we can use VOSF and we need it actually
466        DEFINES="$DEFINES -DREAL_ADDRESSING"
467        break
468        ;;
469      direct)
470 <      dnl Requires VOSF
470 >      dnl Requires VOSF screen updates
471        if [[ "x$CAN_VOSF" = "xyes" ]]; then
472          ADDRESSING_MODE="direct"
473          WANT_VOSF=yes dnl we can use VOSF and we need it actually
# Line 500 | Line 491 | else
491    fi
492   fi
493  
494 < dnl Since real and direct addressing modes automatically activate VOSF,
495 < dnl I put this test here.
505 < if [[ "x$WANT_VOSF" = "xyes" ]]; then
506 <  if [[ "x$CAN_VOSF" = "xno" ]]; then
507 <    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
508 <    WANT_VOSF=no
509 <  else
494 > dnl Enable VOSF screen updates with this feature is requested and feasible
495 > if [[ "x$WANT_VOSF" = "xyes" -a "x$CAN_VOSF" = "xyes" ]]; then
496      AC_DEFINE(ENABLE_VOSF)
497 <  fi
497 > else
498 >    WANT_VOSF=no
499   fi
500  
501   dnl Check for GAS.
# Line 545 | Line 532 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
532    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
533    if [[ "x$HAVE_GAS" = "xyes" ]]; then
534      ASM_OPTIMIZATIONS=i386
535 <    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
535 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DUNALIGNED_PROFITABLE -DOPTIMIZED_FLAGS"
536      CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
537      FPUSRCS="../uae_cpu/fpu_x86.cpp"
538    fi
# Line 559 | Line 546 | elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HA
546      case "$SPARC_TYPE" in
547      SPARC_V8)
548        ASM_OPTIMIZATIONS="SPARC V8 architecture"
549 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
549 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
550        CFLAGS="$CFLAGS -Wa,-Av8"
551        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
552        ;;
553      SPARC_V9)
554        ASM_OPTIMIZATIONS="SPARC V9 architecture"
555 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
555 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
556        CFLAGS="$CFLAGS -Wa,-Av9"
557        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
558        ;;

Diff Legend

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