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

Comparing SheepShaver/src/Unix/configure.in (file contents):
Revision 1.5 by gbeauche, 2003-05-22T22:12:04Z vs.
Revision 1.6 by gbeauche, 2003-09-07T14:21:20Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8   dnl Options.
9 + AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
10   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
11   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
12   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
# Line 30 | Line 31 | AC_EGREP_CPP(yes,
31   #endif
32   ], [AC_MSG_RESULT(yes); HAVE_PPC=yes], AC_MSG_RESULT(no))
33  
34 + dnl We use native CPU if possible.
35 + EMULATED_PPC=yes
36 + case $WANT_EMULATED_PPC in
37 +  auto) [[ "x$HAVE_PPC" = "xyes" ]] && EMULATED_PPC=no;;
38 +  no)   EMULATED_PPC=no;;
39 + esac
40 + if [[ "x$EMULATED_PPC" = "xyes" ]]; then
41 +  AC_DEFINE(EMULATED_PPC)
42 + fi
43 +
44   dnl We use mon if possible.
45   MONSRCS=
46   if [[ "x$WANT_MON" = "xyes" ]]; then
# Line 69 | Line 80 | LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -l
80  
81   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
82   HAVE_PTHREADS=yes
83 < if [[ "x$HAVE_PPC" = "xno" ]]; then
83 > if [[ "x$EMULATED_PPC" = "xyes" ]]; then
84    AC_CHECK_LIB(pthread, pthread_create, , [
85      AC_CHECK_LIB(c_r, pthread_create, , [
86        AC_CHECK_LIB(PTL, pthread_create, , [
# Line 141 | Line 152 | fi
152   dnl Checks for header files.
153   AC_HEADER_STDC
154   AC_HEADER_SYS_WAIT
155 < AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h sys/mman.h)
155 > AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
156 > AC_CHECK_HEADERS(sys/time.h sys/times.h)
157 > AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
158  
159   dnl Checks for typedefs, structures, and compiler characteristics.
160   AC_C_BIGENDIAN
# Line 169 | Line 182 | AC_CHECK_FUNCS(mmap mprotect munmap)
182   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
183  
184   dnl Select system-dependant sources.
185 < if [[ "x$HAVE_PPC" = "xyes" ]]; then
185 > if [[ "x$EMULATED_PPC" = "xno" ]]; then
186    SYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
187   else
188 <  SYSSRCS="../emul_ppc/emul_ppc.cpp"
188 >  SYSSRCS="../kpx_cpu/sheepshaver_glue.cpp \
189 >        ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
190 >        ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
191 >        ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp"
192 >  CPPFLAGS="$CPPFLAGS -I../kpx_cpu -I../kpx_cpu/include -I../kpx_cpu/src -I../kpx_cpu/src/cpu"
193   fi
194   SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
195  
# Line 501 | Line 518 | echo SheepShaver configuration summary:
518   echo
519   echo XFree86 DGA support .............. : $WANT_XF86_DGA
520   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
521 + echo Using PowerPC emulator ........... : $EMULATED_PPC
522   echo Enable video on SEGV signals ..... : $WANT_VOSF
523   echo ESD sound support ................ : $WANT_ESD
524   echo GTK user interface ............... : $WANT_GTK

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines