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.15 by gbeauche, 2004-01-04T18:38:00Z vs.
Revision 1.30 by gbeauche, 2004-06-27T22:12:52Z

# Line 13 | Line 13 | dnl Options.
13   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
14   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
15   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
16 < AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
16 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
17   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
18   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
19   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
20   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
21 + AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
22 +
23 + dnl SDL options.
24 + AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
25 + AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
26  
27   dnl Checks for programs.
28   AC_PROG_CC
# Line 34 | Line 39 | AC_EGREP_CPP(yes,
39   #ifdef __powerpc__
40    yes
41   #endif
42 + #ifdef __ppc__
43 +  yes
44 + #endif
45   ], [AC_MSG_RESULT(yes); HAVE_PPC=yes], AC_MSG_RESULT(no))
46  
47   dnl We use native CPU if possible.
# Line 82 | Line 90 | fi
90   dnl Checks for libraries.
91   AC_CHECK_LIB(posix4, sem_init)
92  
93 < dnl We need X11.
94 < AC_PATH_XTRA
95 < if [[ "x$no_x" = "xyes" ]]; then
96 <  AC_MSG_ERROR([You need X11 to run SheepShaver.])
97 < fi
98 < CFLAGS="$CFLAGS $X_CFLAGS"
99 < CXXFLAGS="$CXXFLAGS $X_CFLAGS"
100 < LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
93 > dnl Do we need SDL?
94 > WANT_SDL=no
95 > SDL_SUPPORT="none"
96 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
97 >  WANT_SDL=yes
98 >  WANT_XF86_DGA=no
99 >  WANT_XF86_VIDMODE=no
100 >  WANT_FBDEV_DGA=no
101 >  SDL_SUPPORT="video"
102 > fi
103 > if [[ "x$WANT_SDL" = "xyes" ]]; then
104 >  AC_PATH_PROG(sdl_config, "sdl-config")
105 >  if [[ -n "$sdl_config" ]]; then
106 >    sdl_cflags=`$sdl_config --cflags`
107 >    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
108 >      sdl_libs=`$sdl_config --static-libs`
109 >    else
110 >      sdl_libs=`$sdl_config --libs`
111 >    fi
112 >    CFLAGS="$CFLAGS $sdl_cflags"
113 >    CXXFLAGS="$CXXFLAGS $sdl_cflags"
114 >    LIBS="$LIBS $sdl_libs"
115 >  else
116 >    WANT_SDL=no
117 >  fi
118 > fi
119 >
120 > dnl We need X11, if not using SDL.
121 > if [[ "x$WANT_SDL" = "xno" ]]; then
122 >  AC_PATH_XTRA
123 >  if [[ "x$no_x" = "xyes" ]]; then
124 >    AC_MSG_ERROR([You need X11 to run SheepShaver.])
125 >  fi
126 >  CFLAGS="$CFLAGS $X_CFLAGS"
127 >  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
128 >  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
129 > fi
130  
131   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
132   HAVE_PTHREADS=yes
133 < if [[ "x$EMULATED_PPC" = "xyes" ]]; then
133 > case $EMULATED_PPC:$target_os in
134 > no:linux*)
135 >  dnl We do have our own pthread_cancel() implementation
136 >  AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
137 >  ;;
138 > *:*)
139    AC_CHECK_LIB(pthread, pthread_create, , [
140      AC_CHECK_LIB(c_r, pthread_create, , [
141        AC_CHECK_LIB(PTL, pthread_create, , [
# Line 102 | Line 144 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
144      ])
145    ])
146    AC_CHECK_FUNCS(pthread_cancel)
147 +  AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
148 +  AC_CHECK_FUNCS(pthread_mutexattr_settype)
149 +  AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
150    if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
151      AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
152    fi
153 < else
154 <  dnl We do have our own pthread_cancel() implementation
155 <  AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
111 < fi
112 <
113 < dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
114 < SEMSRC=
115 < AC_CHECK_FUNCS(sem_init, , [
153 >  dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
154 >  SEMSRC=
155 >  AC_CHECK_FUNCS(sem_init, , [
156    if test "x$HAVE_PTHREADS" = "xyes"; then
157      SEMSRC=posix_sem.cpp
158    fi
159 < ])
159 >  ])
160 >  ;;
161 > esac
162  
163   dnl We use XFree86 DGA if possible.
164   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 141 | Line 183 | if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]];
183   fi
184  
185   dnl We use GTK+ if possible.
186 < UISRCS=
186 > UISRCS=../dummy/prefs_editor_dummy.cpp
187   if [[ "x$WANT_GTK" = "xyes" ]]; then
188    AM_PATH_GTK(1.2.0, [
189      AC_DEFINE(ENABLE_GTK)
# Line 174 | Line 216 | AC_HEADER_SYS_WAIT
216   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
217   AC_CHECK_HEADERS(sys/time.h sys/times.h)
218   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
219 + AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h)
220  
221   dnl Checks for typedefs, structures, and compiler characteristics.
222   AC_C_BIGENDIAN
# Line 193 | Line 236 | AC_TYPE_SIGNAL
236   AC_HEADER_TIME
237   AC_STRUCT_TM
238  
239 + dnl Check whether struct sigaction has sa_restorer member.
240 + AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
241 +  ac_cv_signal_sa_restorer, [
242 +  AC_TRY_COMPILE([
243 +    #include <signal.h>
244 +  ], [struct sigaction sa; sa.sa_restorer = 0;],
245 +  ac_cv_signal_sa_restorer=yes, ac_cv_signal_sa_restorer=no,
246 +  dnl When cross-compiling, do not assume anything.
247 +  ac_cv_signal_sa_restorer=no
248 +  )
249 + ])
250 + if [[ "x$ac_cv_signal_sa_restorer" = "xyes" ]]; then
251 +  AC_DEFINE(HAVE_SIGNAL_SA_RESTORER)
252 + fi
253 +
254   dnl Checks for library functions.
255 < AC_CHECK_FUNCS(strdup cfmakeraw)
256 < AC_CHECK_FUNCS(nanosleep clock_gettime timer_create)
255 > AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
256 > AC_CHECK_FUNCS(nanosleep)
257   AC_CHECK_FUNCS(sigaction signal)
258   AC_CHECK_FUNCS(mmap mprotect munmap)
259   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
260 + AC_CHECK_FUNCS(posix_memalign memalign valloc)
261 +
262 + dnl Darwin seems to define mach_task_self() instead of task_self().
263 + AC_CHECK_FUNCS(mach_task_self task_self)
264 +
265 + dnl We need clock_gettime() for better performance but it may drag
266 + dnl libpthread in, which we don't want for native ppc mode
267 + case $EMULATED_PPC:$target_os in
268 + no:linux*)
269 +  ;;
270 + *:*)
271 +  AC_SEARCH_LIBS(clock_gettime, [rt posix4])
272 +  AC_CHECK_FUNCS(clock_gettime)
273 +  ;;
274 + esac
275 +
276 + dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
277 + AC_DEFUN(AC_CHECK_FRAMEWORK, [
278 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
279 +  AC_CACHE_CHECK([whether compiler supports framework $1],
280 +    ac_Framework, [
281 +    saved_LIBS="$LIBS"
282 +    LIBS="$LIBS -framework $1"
283 +    AC_TRY_LINK(
284 +      [$2], [int main(void) { return 0; }],
285 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
286 +    )
287 +  ])
288 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
289 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
290 +  )
291 +  AS_VAR_POPDEF([ac_Framework])dnl
292 + ])
293 +
294 + dnl Check for some MacOS X frameworks
295 + AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
296 + AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
297  
298   dnl Select system-dependant sources.
299 < if [[ "x$EMULATED_PPC" = "xno" ]]; then
300 <  SYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
299 > SERIALSRC=serial_unix.cpp
300 > ETHERSRC=../dummy/ether_dummy.cpp
301 > SCSISRC=../dummy/scsi_dummy.cpp
302 > AUDIOSRC=../dummy/audio_dummy.cpp
303 > EXTRASYSSRCS=
304 > case "$target_os" in
305 > linux*)
306 >  ETHERSRC=Linux/ether_linux.cpp
307 >  AUDIOSRC=audio_oss_esd.cpp
308 >  SCSISRC=Linux/scsi_linux.cpp
309 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
310 >    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
311 >  fi
312 >  ;;
313 > darwin*)
314 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
315 >    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
316 >  fi
317 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
318 >    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
319 >  fi
320 >  ;;
321 > esac
322 >
323 > dnl SDL overrides
324 > if [[ "x$WANT_SDL" = "xyes" ]]; then
325 >  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
326 > fi
327 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
328 >  VIDEOSRCS="../SDL/video_sdl.cpp"
329 >  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
330 >  KEYCODES="../SDL/keycodes"
331 >  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
332 >    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
333 >  else
334 >    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
335 >  fi
336 > else
337 >  VIDEOSRCS="video_x.cpp"
338 >  KEYCODES="keycodes"
339 >  EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
340   fi
341 < SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
341 >
342 > SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
343  
344   dnl Define a macro that translates a yesno-variable into a C macro definition
345   dnl to be put into the config.h file
# Line 217 | Line 352 | AC_DEFUN(AC_TRANSLATE_DEFINE, [
352      fi
353   ])
354  
355 + dnl Check that the host supports TUN/TAP devices
356 + AC_CACHE_CHECK([whether TUN/TAP is supported],
357 +  ac_cv_tun_tap_support, [
358 +  AC_TRY_COMPILE([
359 +    #if defined(HAVE_LINUX_IF_H) && defined(HAVE_LINUX_IF_TUN_H)
360 +    #include <linux/if.h>
361 +    #include <linux/if_tun.h>
362 +    #endif
363 +    #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_IF_TUN_H)
364 +    #include <net/if.h>
365 +    #include <net/if_tun.h>
366 +    #endif
367 +  ], [
368 +    struct ifreq ifr;
369 +    memset(&ifr, 0, sizeof(ifr));
370 +    ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
371 +  ],
372 +  ac_cv_tun_tap_support=yes, ac_cv_tun_tap_support=no
373 +  )
374 + ])
375 + AC_TRANSLATE_DEFINE(ENABLE_TUNTAP, "$ac_cv_tun_tap_support",
376 +  [Define if your system supports TUN/TAP devices.])
377 +
378   dnl Various checks if the system supports vm_allocate() and the like functions.
379   have_mach_vm=no
380   if [[ "x$ac_cv_func_vm_allocate" = "xyes" -a "x$ac_cv_func_vm_deallocate" = "xyes" -a \
# Line 363 | Line 521 | AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, $have_
521  
522   fi dnl HAVE_MMAP_VM
523  
524 < dnl Check if we can mmap 0x2000 bytes from 0x0000
525 < AC_CACHE_CHECK([whether we can map Low Memory area 0x0000-0x2000],
524 > dnl Check if we can modify the __PAGEZERO segment for use as Low Memory
525 > AC_CACHE_CHECK([whether __PAGEZERO can be Low Memory area 0x0000-0x3000],
526 >  ac_cv_pagezero_hack, [
527 >  ac_cv_pagezero_hack=no
528 >  if AC_TRY_COMMAND([Darwin/testlmem.sh 0x3000]); then
529 >    ac_cv_pagezero_hack=yes
530 >    dnl might as well skip the test for mmap-able low memory
531 >    ac_cv_can_map_lm=no
532 >  fi
533 > ])
534 > AC_TRANSLATE_DEFINE(PAGEZERO_HACK, "$ac_cv_pagezero_hack",
535 >  [Define if the __PAGEZERO Mach-O Low Memory Globals hack works on this system.])
536 >
537 > dnl Check if we can mmap 0x3000 bytes from 0x0000
538 > AC_CACHE_CHECK([whether we can map Low Memory area 0x0000-0x3000],
539    ac_cv_can_map_lm, [
540    AC_LANG_SAVE
541    AC_LANG_CPLUSPLUS
# Line 447 | Line 618 | AC_CACHE_CHECK([whether sigaction handle
618   AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall",
619    [Define if your system requires sigactions to be reinstalled.])
620  
621 < dnl Check if extended signals are supported.
622 < AC_CACHE_CHECK([whether your system supports extended signal handlers],
623 <  ac_cv_have_extended_signals, [
621 > dnl Check if Mach exceptions supported.
622 > AC_CACHE_CHECK([whether your system supports Mach exceptions],
623 >  ac_cv_have_mach_exceptions, [
624    AC_LANG_SAVE
625    AC_LANG_CPLUSPLUS
626    AC_TRY_RUN([
627 <    #define HAVE_SIGINFO_T 1
627 >    #define HAVE_MACH_EXCEPTIONS 1
628      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
629      #include "vm_alloc.cpp"
630      #include "sigsegv.cpp"
631 <  ], ac_cv_have_extended_signals=yes, ac_cv_have_extended_signals=no,
631 >  ],
632 >  ac_cv_have_mach_exceptions=yes,
633 >  ac_cv_have_mach_exceptions=no,
634    dnl When cross-compiling, do not assume anything.
635 <  ac_cv_have_extended_signals=no
635 >  ac_cv_have_mach_exceptions=no
636    )
637    AC_LANG_RESTORE
638    ]
639   )
640 < AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals",
641 <  [Define if your system support extended signals.])
640 > if [[ "$ac_cv_have_mach_exceptions" = "yes" ]]; then
641 >  sigsegv_recovery=mach
642 > fi
643 > AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
644 >  [Define if your system supports Mach exceptions.])
645 >
646 > dnl Otherwise, check if extended signals are supported.
647 > if [[ -z "$sigsegv_recovery" ]]; then
648 >  AC_CACHE_CHECK([whether your system supports extended signal handlers],
649 >    ac_cv_have_extended_signals, [
650 >    AC_LANG_SAVE
651 >    AC_LANG_CPLUSPLUS
652 >    AC_TRY_RUN([
653 >      #define HAVE_SIGINFO_T 1
654 >      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
655 >      #include "vm_alloc.cpp"
656 >      #include "sigsegv.cpp"
657 >    ],
658 >    ac_cv_have_extended_signals=yes,
659 >    ac_cv_have_extended_signals=no,
660 >    dnl When cross-compiling, do not assume anything.
661 >    ac_cv_have_extended_signals=no
662 >    )
663 >    AC_LANG_RESTORE
664 >    ]
665 >  )
666 >  if [[ "$ac_cv_have_extended_signals" = "yes" ]]; then
667 >    sigsegv_recovery=siginfo
668 >  fi
669 >  AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals",
670 >    [Define if your system support extended signals.])
671 > fi
672  
673   dnl Otherwise, check for subterfuges.
674 < if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
674 > if [[ -z "$sigsegv_recovery" ]]; then
675    AC_CACHE_CHECK([whether we then have a subterfuge for your system],
676    ac_cv_have_sigcontext_hack, [
677      AC_LANG_SAVE
# Line 478 | Line 681 | if [[ "x$ac_cv_have_extended_signals" =
681        #define CONFIGURE_TEST_SIGSEGV_RECOVERY
682        #include "vm_alloc.cpp"
683        #include "sigsegv.cpp"
684 <    ], ac_cv_have_sigcontext_hack=yes, ac_cv_have_sigcontext_hack=no,
684 >    ],
685 >    ac_cv_have_sigcontext_hack=yes,
686 >    ac_cv_have_sigcontext_hack=no,
687      dnl When cross-compiling, do not assume anything.
688      ac_cv_have_sigcontext_hack=no
689      )
690      AC_LANG_RESTORE
691    ])
692 +  if [[ "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
693 +    sigsegv_recovery=sigcontext
694 +  fi
695    AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, "$ac_cv_have_sigcontext_hack",
696      [Define if we know a hack to replace siginfo_t->si_addr member.])
697   fi
# Line 510 | Line 718 | AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_IN
718  
719   dnl Can we do Video on SEGV Signals ?
720   CAN_VOSF=no
721 < if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
721 > if [[ -n "$sigsegv_recovery" ]]; then
722    CAN_VOSF=yes
723   fi
724  
# Line 521 | Line 729 | else
729      WANT_VOSF=no
730   fi
731  
732 + dnl Platform specific binary postprocessor
733 + AC_PATH_PROG(BLESS, "true")
734 + if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
735 +  BLESS=Darwin/lowmem
736 +  LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
737 + fi
738 +
739   dnl Check for GCC 2.7 or higher.
740   HAVE_GCC27=no
741   AC_MSG_CHECKING(for GCC 2.7 or higher)
# Line 539 | Line 754 | AC_EGREP_CPP(xyes,
754   #endif
755   ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
756  
757 + dnl Check for ICC.
758 + AC_MSG_CHECKING(for ICC)
759 + HAVE_ICC=no
760 + if $CXX -V -v 2>&1 | grep -q "Intel(R) C++ Compiler"; then
761 +  HAVE_ICC=yes
762 + fi
763 + AC_MSG_RESULT($HAVE_ICC)
764 +
765   # Test if the compiler can generate ELF objects
766   AC_CACHE_CHECK([whether the compiler can generate ELF objects],
767    ac_cv_elf_objects, [
# Line 582 | Line 805 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
805          ac_cv_use_dyngen=no
806          ;;
807        esac
808 +      dnl Check for a suitable synthetic opcodes compiler (icc is faking itself as gcc 3.2.2)
809 +      if [[ -z "$DYNGEN_CC" ]]; then
810 +        if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
811 +          DYNGEN_CC=$CXX
812 +        else
813 +          for p in /usr/bin /usr/local/bin; do
814 +            gxx="$p/g++"
815 +            if [[ -x "$gxx" ]]; then
816 +              DYNGEN_CC="$gxx"
817 +            fi
818 +          done
819 +        fi
820 +      fi
821 +      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
822 +        ac_cv_use_dyngen=no
823 +      fi
824      ])
825      if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
826        case $host_cpu in
# Line 592 | Line 831 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
831          else
832            DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
833          fi
834 +        saved_CPPFLAGS=$CPPFLAGS
835 +        CPPFLAGS="$CPPFLAGS -mmmx"
836 +        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
837 +        CPPFLAGS="$CPPFLAGS -msse"
838 +        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
839 +        CPPFLAGS="$CPPFLAGS -msse2"
840 +        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
841 +        CPPFLAGS=$saved_CPPFLAGS
842 +        ;;
843 +      x86_64)
844 +        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
845          ;;
846        esac
847        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
# Line 646 | Line 896 | fi
896  
897   dnl Generate Makefile.
898   AC_SUBST(DYNGENSRCS)
899 + AC_SUBST(DYNGEN_CC)
900   AC_SUBST(DYNGEN_OP_FLAGS)
901   AC_SUBST(SYSSRCS)
902   AC_SUBST(CPUSRCS)
903 + AC_SUBST(BLESS)
904 + AC_SUBST(KEYCODES)
905   AC_OUTPUT(Makefile)
906  
907   dnl Print summary.
908   echo
909   echo SheepShaver configuration summary:
910   echo
911 + echo SDL support ...................... : $SDL_SUPPORT
912   echo XFree86 DGA support .............. : $WANT_XF86_DGA
913   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
914   echo Using PowerPC emulator ........... : $EMULATED_PPC
# Line 663 | Line 917 | echo Enable video on SEGV signals .....
917   echo ESD sound support ................ : $WANT_ESD
918   echo GTK user interface ............... : $WANT_GTK
919   echo mon debugger support ............. : $WANT_MON
920 + echo Bad memory access recovery type .. : $sigsegv_recovery
921   echo
922   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines