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.16 by gbeauche, 2005-02-13T15:32:10Z vs.
Revision 1.72 by asvitkine, 2012-06-15T22:58:29Z

# Line 1 | Line 1
1   dnl Process this file with autoconf to produce a configure script.
2   dnl Written in 2002 by Christian Bauer
3  
4 < AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver)
4 > AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver)
5   AC_CONFIG_SRCDIR(main_unix.cpp)
6   AC_PREREQ(2.52)
7   AC_CONFIG_HEADER(config.h)
8 + AH_TOP(
9 + #ifndef CONFIG_H
10 + #define CONFIG_H
11 + )
12 + AH_BOTTOM(
13 + #endif /* CONFIG_H */
14 + )
15  
16   dnl Canonical system information.
17   AC_CANONICAL_HOST
# Line 14 | Line 21 | dnl Some systems do not put corefiles in
21   dnl cores for the configure tests since some are intended to dump core.
22   ulimit -c 0
23  
24 + dnl Invite Cygwin users to build within the Windows/ directory
25 + case $target_os in
26 + *cygwin* | *mingw32*)
27 +  AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.])
28 +  ;;
29 + esac
30 +
31   dnl Options.
32   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
33   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
34 + AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
35   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
36 < AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
36 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
37   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
38 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
39   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
40 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
40 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
41 >  [case "$withval" in
42 >   gtk1)      WANT_GTK="gtk";;
43 >   gtk|gtk2)  WANT_GTK="$withval";;
44 >   yes)       WANT_GTK="gtk2 gtk";;
45 >   *)         WANT_GTK="no";;
46 >   esac],
47 >  [WANT_GTK="gtk2 gtk"])
48   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
49   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
50  
51 + AC_ARG_WITH(bincue,  
52 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
53 +
54 + AC_ARG_WITH(libvhd,  
55 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
56 +
57 +
58   dnl Addressing mode
59   AC_ARG_ENABLE(addressing,
60    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 40 | Line 70 | dnl SDL options.
70   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
71   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
72   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
73 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
74 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
75  
76   dnl Checks for programs.
77   AC_PROG_CC
# Line 90 | Line 122 | if [[ "x$WANT_MON" = "xyes" ]]; then
122    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
123      AC_MSG_RESULT(yes)
124      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
125 <    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"
125 >    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"
126      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
127      AC_CHECK_LIB(ncurses, tgetent, ,
128 <      AC_CHECK_LIB(termcap, tgetent, ,
129 <        AC_CHECK_LIB(termlib, tgetent, ,
130 <          AC_CHECK_LIB(terminfo, tgetent, ,
131 <            AC_CHECK_LIB(Hcurses, tgetent, ,
132 <              AC_CHECK_LIB(curses, tgetent))))))
128 >      [AC_CHECK_LIB(termcap, tgetent, ,
129 >        [AC_CHECK_LIB(termlib, tgetent, ,
130 >          [AC_CHECK_LIB(terminfo, tgetent, ,
131 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
132 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
133      AC_CHECK_LIB(readline, readline)
134      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
135    else
# Line 110 | Line 142 | AC_SUBST(MONSRCS)
142  
143   dnl Checks for libraries.
144   AC_CHECK_LIB(posix4, sem_init)
145 + AC_CHECK_LIB(m, cos)
146 +
147 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
148 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
149 + dnl therefore main is undefined with #undef.
150 + dnl Framework can be in an custom location.
151 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
152 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
153 +  AC_CACHE_CHECK([whether compiler supports framework $1],
154 +    ac_Framework, [
155 +    saved_LIBS="$LIBS"
156 +    LIBS="$LIBS -framework $1"
157 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
158 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
159 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
160 +      fi
161 +    fi
162 +    saved_CPPFLAGS="$CPPFLAGS"
163 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
164 +    AC_TRY_LINK(
165 +      [$2
166 + #undef main], [],
167 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
168 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
169 +    )
170 +  ])
171 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
172 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
173 +  )
174 +  AS_VAR_POPDEF([ac_Framework])
175 + ])
176  
177   dnl Do we need SDL?
178   WANT_SDL=no
# Line 125 | Line 188 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
188    SDL_SUPPORT="$SDL_SUPPORT audio"
189   fi
190   if [[ "x$WANT_SDL" = "xyes" ]]; then
191 <  AC_PATH_PROG(sdl_config, "sdl-config")
192 <  if [[ -n "$sdl_config" ]]; then
193 <    case $target_os in
194 <    # Special treatment for Cygwin so that we can still use the POSIX layer
195 <    *cygwin*)
196 <      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
197 <      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
198 <      ;;
136 <    *)
191 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
192 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
193 >  else
194 >    ac_cv_framework_SDL=no
195 >  fi
196 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
197 >    AC_PATH_PROG(sdl_config, "sdl-config")
198 >    if [[ -n "$sdl_config" ]]; then
199        sdl_cflags=`$sdl_config --cflags`
200        if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
201          sdl_libs=`$sdl_config --static-libs`
202        else
203          sdl_libs=`$sdl_config --libs`
204        fi
205 <      ;;
206 <    esac
207 <    CFLAGS="$CFLAGS $sdl_cflags"
208 <    CXXFLAGS="$CXXFLAGS $sdl_cflags"
209 <    LIBS="$LIBS $sdl_libs"
210 <  else
211 <    WANT_SDL=no
212 <    WANT_SDL_VIDEO=no
151 <    WANT_SDL_AUDIO=no
205 >      CFLAGS="$CFLAGS $sdl_cflags"
206 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
207 >      LIBS="$LIBS $sdl_libs"
208 >    else
209 >      WANT_SDL=no
210 >      WANT_SDL_VIDEO=no
211 >      WANT_SDL_AUDIO=no
212 >    fi
213    fi
214    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
215   else
# Line 166 | Line 227 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
227    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
228   fi
229  
230 +
231 +
232   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
233   HAVE_PTHREADS=yes
234   case $EMULATED_PPC:$target_os in
235 < no:linux*)
235 > no:linux*|no:netbsd*)
236    dnl We do have our own pthread_cancel() implementation
237    AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
238    ;;
# Line 177 | Line 240 | no:linux*)
240    AC_CHECK_LIB(pthread, pthread_create, , [
241      AC_CHECK_LIB(c_r, pthread_create, , [
242        AC_CHECK_LIB(PTL, pthread_create, , [
243 <        AC_MSG_ERROR([You need pthreads to run Basilisk II.])
243 >        dnl XXX remove when no pthreads case is merged
244 >        AC_MSG_ERROR([You need pthreads to run SheepShaver.])
245 >        HAVE_PTHREADS=no
246        ])
247      ])
248    ])
249    AC_CHECK_FUNCS(pthread_cancel)
250 +  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
251    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
252    AC_CHECK_FUNCS(pthread_mutexattr_settype)
253    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
188  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
189    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
190  fi
254    dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
255    SEMSRC=
256    AC_CHECK_FUNCS(sem_init, , [
# Line 197 | Line 260 | no:linux*)
260    ])
261    ;;
262   esac
263 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
264 +  AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
265 + fi
266 +
267 + dnl We use FBDev DGA if possible.
268 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
269 +  AC_CHECK_HEADER(linux/fb.h, [
270 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
271 +  ], [
272 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
273 +    WANT_FBDEV_DGA=no
274 +  ])
275 + fi
276  
277   dnl We use XFree86 DGA if possible.
278   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 222 | Line 298 | fi
298  
299   dnl We use GTK+ if possible.
300   UISRCS=../dummy/prefs_editor_dummy.cpp
301 < if [[ "x$WANT_GTK" = "xyes" ]]; then
301 > case "x$WANT_GTK" in
302 > xgtk2*)
303 >  WANT_GTK=no
304 >  AM_PATH_GTK_2_0(1.3.15, [
305 >    GUI_CFLAGS="$GTK_CFLAGS"
306 >    GUI_LIBS="$GTK_LIBS"
307 >    WANT_GTK=gtk2
308 >  ], [
309 >    case "x${WANT_GTK}x" in
310 >    *gtkx)
311 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
312 >      WANT_GTK=gtk
313 >      ;;
314 >    *)
315 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
316 >      WANT_GTK=no
317 >     ;;
318 >    esac
319 >  ])
320 >  ;;
321 > esac
322 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
323 >  WANT_GTK=no
324    AM_PATH_GTK(1.2.0, [
325 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
326 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
327 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
230 <    LIBS="$LIBS $GTK_LIBS"
231 <    UISRCS=prefs_editor_gtk.cpp
325 >    GUI_CFLAGS="$GTK_CFLAGS"
326 >    GUI_LIBS="$GTK_LIBS"
327 >    WANT_GTK=gtk
328    ], [
329      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
234    WANT_GTK=no
330    ])
331   fi
332 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
333 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
334 +  UISRCS=prefs_editor_gtk.cpp
335 + fi
336 + AC_SUBST(GUI_CFLAGS)
337 + AC_SUBST(GUI_LIBS)
338 +
339 + dnl Build external GUI if requested.
340 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
341 +  WANT_STANDALONE_GUI=no
342 + fi
343 + if [[ "$WANT_GTK" = "no" ]]; then
344 +  WANT_STANDALONE_GUI=no
345 + fi
346 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
347  
348   dnl We use ESD if possible.
349   if [[ "x$WANT_ESD" = "xyes" ]]; then
350 +  WANT_ESD=no
351    AM_PATH_ESD(0.2.8, [
352      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
353      CFLAGS="$CFLAGS $ESD_CFLAGS"
354      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
355      LIBS="$LIBS $ESD_LIBS"
356 +    WANT_ESD=yes
357    ], [
358      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
247    WANT_ESD=no
359    ])
360   fi
361  
# Line 254 | Line 365 | AC_SYS_LARGEFILE
365   dnl Checks for header files.
366   AC_HEADER_STDC
367   AC_HEADER_SYS_WAIT
368 < AC_CHECK_HEADERS(malloc.h)
368 > AC_CHECK_HEADERS(malloc.h stdint.h)
369   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
259 AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
370   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
371 < AC_CHECK_HEADERS(linux/if.h, [], [], [
372 < #if HAVE_SYS_SOCKET_H
373 < # include <sys/socket.h>
371 > AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
372 > AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
373 > AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
374 > #ifdef HAVE_SYS_TYPES_H
375 > #include <sys/types.h>
376 > #endif
377 > #ifdef HAVE_SYS_SOCKET_H
378 > #include <sys/socket.h>
379   #endif
380   ])
381 < AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
381 > AC_CHECK_HEADERS(AvailabilityMacros.h)
382 > AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
383   AC_CHECK_HEADERS(fenv.h)
384  
385   dnl Checks for typedefs, structures, and compiler characteristics.
# Line 284 | Line 400 | AC_TYPE_SIGNAL
400   AC_HEADER_TIME
401   AC_STRUCT_TM
402  
403 + dnl Check whether sys/socket.h defines type socklen_t.
404 + dnl (extracted from ac-archive/Miscellaneous)
405 + AC_CACHE_CHECK([for socklen_t],
406 +  ac_cv_type_socklen_t, [
407 +  AC_TRY_COMPILE([
408 +    #include <sys/types.h>
409 +    #include <sys/socket.h>
410 +  ], [socklen_t len = 42; return 0;],
411 +  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
412 +  dnl When cross-compiling, do not assume anything.
413 +  ac_cv_type_socklen_t="guessing no"
414 +  )
415 + ])
416 + if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
417 +  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
418 + fi
419 +
420   dnl Check whether struct sigaction has sa_restorer member.
421   AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
422    ac_cv_signal_sa_restorer, [
# Line 300 | Line 433 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
433   fi
434  
435   dnl Checks for library functions.
436 < AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
436 > AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
437   AC_CHECK_FUNCS(nanosleep)
438   AC_CHECK_FUNCS(sigaction signal)
439   AC_CHECK_FUNCS(mmap mprotect munmap)
440   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
441 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
442 < AC_CHECK_FUNCS(exp2f log2f exp2 log2 trunc)
441 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
442 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
443 > AC_CHECK_FUNCS(poll inet_aton)
444  
445   dnl Darwin seems to define mach_task_self() instead of task_self().
446   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 318 | Line 452 | no:linux*)
452    ;;
453   *:*)
454    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
455 <  AC_CHECK_FUNCS(clock_gettime)
455 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
456    ;;
457   esac
458  
# Line 346 | Line 480 | mips-sony-bsd|mips-sony-newsos4)
480   *-*-cygwin*)
481          no_dev_ptmx=1
482          ;;
483 + *-*-darwin*)
484 +        no_dev_ptmx=1
485 +        ;;
486   esac
487  
488   if test -z "$no_dev_ptmx" ; then
# Line 366 | Line 503 | AC_CHECK_FILE([/dev/ptc],
503   )
504   dnl (end of code from openssh-3.2.2p1 configure.ac)
505  
506 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
507 + dnl doesn't work or is unimplemented. On these systems (mostly older
508 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
509 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
510 +  ac_cv_nonblocking_io, [
511 +  case "$host" in
512 +  *-*-osf*)
513 +    ac_cv_nonblocking_io=FIONBIO
514 +    ;;
515 +  *-*-sunos4*)
516 +    ac_cv_nonblocking_io=FIONBIO
517 +    ;;
518 +  *-*-ultrix*)
519 +    ac_cv_nonblocking_io=FIONBIO
520 +    ;;
521 +  *)
522 +    ac_cv_nonblocking_io=O_NONBLOCK
523 +    ;;
524 +  esac
525 + ])
526 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
527 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
528 + fi
529 +
530 + dnl Check whether compiler supports byte bit-fields
531 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
532 +  ac_cv_have_byte_bitfields, [
533 +  AC_LANG_SAVE
534 +  AC_LANG_CPLUSPLUS
535 +  AC_TRY_RUN([
536 +    struct A {
537 +      unsigned char b1:4;
538 +      unsigned char b2:4;
539 +      unsigned char c;
540 +      unsigned short s;
541 +      unsigned char a[4];
542 +    };
543 +
544 +    int main(void) {
545 +      A a;
546 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
547 +    }],
548 +    [ac_cv_have_byte_bitfields=yes],
549 +    [ac_cv_have_byte_bitfields=no],
550 +    dnl When cross-compiling, assume only GCC supports this
551 +    [if [[ "$GCC" = "yes" ]]; then
552 +      ac_cv_have_byte_bitfields="guessing yes"
553 +    else
554 +      ac_cv_have_byte_bitfields="guessing no"
555 +    fi]
556 +    )
557 +  AC_LANG_RESTORE
558 + ])
559 +
560   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
561 < AC_DEFUN(AC_CHECK_FRAMEWORK, [
561 > AC_DEFUN([AC_CHECK_FRAMEWORK], [
562    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
563    AC_CACHE_CHECK([whether compiler supports framework $1],
564      ac_Framework, [
565      saved_LIBS="$LIBS"
566      LIBS="$LIBS -framework $1"
567      AC_TRY_LINK(
568 <      [$2], [int main(void) { return 0; }],
568 >      [$2], [],
569        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
570      )
571    ])
# Line 387 | Line 578 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
578   dnl Check for some MacOS X frameworks
579   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
580   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
581 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
582 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
583 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
584 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
585 + AC_CHECK_FRAMEWORK(AppKit, [])
586  
587   dnl Select system-dependant sources.
588   SERIALSRC=serial_unix.cpp
589   ETHERSRC=../dummy/ether_dummy.cpp
590   SCSISRC=../dummy/scsi_dummy.cpp
591   AUDIOSRC=../dummy/audio_dummy.cpp
592 + PREFSSRC=../dummy/prefs_dummy.cpp
593   EXTFSSRC=extfs_unix.cpp
594   EXTRASYSSRCS=
595   case "$target_os" in
596   linux*)
597 <  ETHERSRC=Linux/ether_linux.cpp
597 >  ETHERSRC=ether_unix.cpp
598    AUDIOSRC=audio_oss_esd.cpp
599    SCSISRC=Linux/scsi_linux.cpp
600    if [[ "x$EMULATED_PPC" = "xno" ]]; then
601 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
601 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
602 >  fi
603 >  ;;
604 > freebsd*)
605 >  ETHERSRC=ether_unix.cpp
606 >  ;;
607 > netbsd*)
608 >  ETHERSRC=ether_unix.cpp
609 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
610 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
611    fi
612    ;;
613   darwin*)
614 +  ETHERSRC=ether_unix.cpp
615    if [[ "x$EMULATED_PPC" = "xno" ]]; then
616 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
616 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
617    fi
618 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
618 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
619      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
620    fi
621    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
622 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
622 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
623 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
624 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
625 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
626 >    fi
627    fi
628 +  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
629 +    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
630 +    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
631 +  fi
632 +  ;;
633 + irix*)
634 +  AUDIOSRC=Irix/audio_irix.cpp
635 +  LIBS="$LIBS -laudio"
636 +  WANT_ESD=no
637 +
638 +  dnl Check if our compiler supports -IPA (MIPSPro)
639 +  HAVE_IPA=no
640 +  ocflags="$CFLAGS"
641 +  CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
642 +  AC_MSG_CHECKING(if "-IPA" works)
643 +  dnl Do a test compile of an empty function
644 +  AC_TRY_COMPILE([#if defined __GNUC__
645 +                  # error GCC does not support IPA yet
646 +                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
647 +  CFLAGS="$ocflags"
648    ;;
649 < cygwin*)
650 <  SERIALSRC="../dummy/serial_dummy.cpp"
649 > esac
650 >
651 > dnl BINCUE
652 > AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
653 > AS_IF([test  "x$have_bincue" = "xyes" ], [
654 >   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
655 >       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
656 >   else
657 >       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
658 >   fi
659 > ])
660 >
661 > dnl LIBVHD
662 > AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
663 > AS_IF([test  "x$have_libvhd" = "xyes" ], [
664 >       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
665 >           LIBS="$LIBS -lvhd"
666 >           case $target_os in
667 >           linux*)
668 >           LIBS="$LIBS -luuid"
669 >           esac
670 >           AC_CHECK_LIB(vhd, vhd_open)
671 >           AC_CHECK_LIB(vhd, vhd_io_read)
672 >           AC_CHECK_LIB(vhd, vhd_io_write)
673 >           AC_CHECK_LIB(vhd, vhd_close)
674 > ])
675 >
676 >
677 >
678 >
679 > dnl Is the slirp library supported?
680 > case "$ac_cv_have_byte_bitfields" in
681 > yes|"guessing yes")
682 >  CAN_SLIRP=yes
683 >  ETHERSRC=ether_unix.cpp
684    ;;
685   esac
686 + if [[ -n "$CAN_SLIRP" ]]; then
687 +  AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
688 +  SLIRP_SRCS="\
689 +    ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
690 +    ../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
691 +    ../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
692 +    ../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
693 +    ../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
694 +    ../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
695 + fi
696 + AC_SUBST(SLIRP_SRCS)
697  
698   dnl SDL overrides
699   if [[ "x$WANT_SDL" = "xyes" ]]; then
700    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
701 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
702 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
703 +  fi
704   fi
705   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
706    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 430 | Line 708 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
708    KEYCODES="../SDL/keycodes"
709    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
710      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
711 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
712 +    CPPFLAGS="$CPPFLAGS -I../MacOSX"
713    else
714 <    case "$target_os" in
435 <    cygwin*)
436 <      EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
437 <      ;;
438 <    *)
439 <      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
440 <      ;;
441 <    esac
714 >    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
715    fi
716   else
717    VIDEOSRCS="video_x.cpp"
# Line 450 | Line 723 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
723    AUDIOSRC="../SDL/audio_sdl.cpp"
724   fi
725  
726 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
726 > dnl BINCUE overrides
727 >
728 > if [[ "x$have_bincue" = "xyes" ]]; then
729 >  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
730 > fi
731 >
732 > dnl libvhd overrides
733 >
734 > if [[ "x$have_libvhd" = "xyes" ]]; then
735 >  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
736 > fi
737 >
738 >
739 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
740  
741   dnl Define a macro that translates a yesno-variable into a C macro definition
742   dnl to be put into the config.h file
743   dnl $1 -- the macro to define
744   dnl $2 -- the value to translate
745   dnl $3 -- template name
746 < AC_DEFUN(AC_TRANSLATE_DEFINE, [
746 > AC_DEFUN([AC_TRANSLATE_DEFINE], [
747      if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
748          AC_DEFINE($1, 1, $3)
749      fi
# Line 866 | Line 1152 | fi
1152  
1153   dnl Check addressing mode to use
1154   AC_MSG_CHECKING([for addressing mode to use])
869 case "$os_target" in
870 cygwin*)
871  WANT_ADDRESSING_MODE="direct,cygwin-hack"
872  NATMEM_OFFSET=
873  ;;
874 esac
1155   if [[ "$EMULATED_PPC" != "yes" ]]; then
1156    if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
1157      AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
# Line 953 | Line 1233 | EOF
1233   fi
1234   AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1235  
1236 + dnl Utility macro used by next two tests.
1237 + dnl AC_EXAMINE_OBJECT(C source code,
1238 + dnl     commands examining object file,
1239 + dnl     [commands to run if compile failed]):
1240 + dnl
1241 + dnl Compile the source code to an object file; then convert it into a
1242 + dnl printable representation.  All unprintable characters and
1243 + dnl asterisks (*) are replaced by dots (.).  All white space is
1244 + dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1245 + dnl output, but runs of newlines are compressed to a single newline.
1246 + dnl Finally, line breaks are forcibly inserted so that no line is
1247 + dnl longer than 80 columns and the file ends with a newline.  The
1248 + dnl result of all this processing is in the file conftest.dmp, which
1249 + dnl may be examined by the commands in the second argument.
1250 + dnl
1251 + AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1252 + [AC_LANG_SAVE
1253 + AC_LANG_C
1254 + dnl Next bit cribbed from AC_TRY_COMPILE.
1255 + cat > conftest.$ac_ext <<EOF
1256 + [#line __oline__ "configure"
1257 + #include "confdefs.h"
1258 + $1
1259 + ]EOF
1260 + if AC_TRY_EVAL(ac_compile); then
1261 +  od -c conftest.o |
1262 +    sed ['s/^[0-7]*[    ]*/ /
1263 +          s/\*/./g
1264 +          s/ \\n/*/g
1265 +          s/ [0-9][0-9][0-9]/./g
1266 +          s/  \\[^ ]/./g'] |
1267 +    tr -d '
1268 + ' | tr -s '*' '
1269 + ' | fold | sed '$a\
1270 + ' > conftest.dmp
1271 +  $2
1272 + ifelse($3, , , else
1273 +  $3
1274 + )dnl
1275 + fi
1276 + rm -rf conftest*
1277 + AC_LANG_RESTORE])
1278 +
1279 + dnl Floating point format probe.
1280 + dnl The basic concept is the same as the above: grep the object
1281 + dnl file for an interesting string.  We have to watch out for
1282 + dnl rounding changing the values in the object, however; this is
1283 + dnl handled by ignoring the least significant byte of the float.
1284 + dnl
1285 + dnl Does not know about VAX G-float or C4x idiosyncratic format.
1286 + dnl It does know about PDP-10 idiosyncratic format, but this is
1287 + dnl not presently supported by GCC.  S/390 "binary floating point"
1288 + dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1289 + dnl as ASCII?)
1290 + dnl
1291 + AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1292 + [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1293 + [gcc_AC_EXAMINE_OBJECT(
1294 + [/* This will not work unless sizeof(double) == 8.  */
1295 + extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1296 +
1297 + /* This structure must have no internal padding.  */
1298 + struct possibility {
1299 +  char prefix[8];
1300 +  double candidate;
1301 +  char postfix[8];
1302 + };
1303 +
1304 + #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1305 + struct possibility table [] =
1306 + {
1307 +  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1308 +  C( 3.53802595280598432000e+18), /* D__float - VAX */
1309 +  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1310 +  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1311 +  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1312 + };],
1313 + [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1314 +    ac_cv_c_float_format='IEEE (big-endian)'
1315 +  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1316 +    ac_cv_c_float_format='IEEE (big-endian)'
1317 +  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1318 +    ac_cv_c_float_format='IEEE (little-endian)'
1319 +  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1320 +    ac_cv_c_float_format='IEEE (little-endian)'
1321 +  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1322 +    ac_cv_c_float_format='VAX D-float'
1323 +  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1324 +    ac_cv_c_float_format='PDP-10'
1325 +  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1326 +    ac_cv_c_float_format='IBM 370 hex'
1327 +  else
1328 +    AC_MSG_ERROR(Unknown floating point format)
1329 +  fi],
1330 +  [AC_MSG_ERROR(compile failed)])
1331 + ])
1332 + # IEEE is the default format.  If the float endianness isn't the same
1333 + # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1334 + # (which is a tristate: yes, no, default).  This is only an issue with
1335 + # IEEE; the other formats are only supported by a few machines each,
1336 + # all with the same endianness.
1337 + format=IEEE_FLOAT_FORMAT
1338 + fbigend=
1339 + case $ac_cv_c_float_format in
1340 +    'IEEE (big-endian)' )
1341 +        if test $ac_cv_c_bigendian = no; then
1342 +            fbigend=1
1343 +        fi
1344 +        ;;
1345 +    'IEEE (little-endian)' )
1346 +        if test $ac_cv_c_bigendian = yes; then
1347 +            fbigend=0
1348 +        fi
1349 +        ;;
1350 +    'VAX D-float' )
1351 +        format=VAX_FLOAT_FORMAT
1352 +        ;;
1353 +    'PDP-10' )
1354 +        format=PDP10_FLOAT_FORMAT
1355 +        ;;
1356 +    'IBM 370 hex' )
1357 +        format=IBM_FLOAT_FORMAT
1358 +        ;;
1359 + esac
1360 + AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1361 +  [Define to the floating point format of the host machine.])
1362 + if test -n "$fbigend"; then
1363 +        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1364 +  [Define to 1 if the host machine stores floating point numbers in
1365 +   memory with the word containing the sign bit at the lowest address,
1366 +   or to 0 if it does it the other way around.
1367 +
1368 +   This macro should not be defined if the ordering is the same as for
1369 +   multi-word integers.])
1370 + fi
1371 + ])
1372 +
1373 + dnl Check for host float format
1374 + gcc_AC_C_FLOAT_FORMAT
1375 +
1376   dnl Platform specific binary postprocessor
1377   AC_PATH_PROG(BLESS, "true")
1378   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
# Line 963 | Line 1383 | fi
1383   dnl Check for GCC 2.7 or higher.
1384   HAVE_GCC27=no
1385   AC_MSG_CHECKING(for GCC 2.7 or higher)
1386 < AC_EGREP_CPP(xyes,
1387 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1388 <  xyes
1389 < #endif
1390 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1386 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1387 >                                     # error gcc < 2.7
1388 >                                     typedef syntax error;
1389 >                                     #endif
1390 >                                   ]])],
1391 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1392 >                  [AC_MSG_RESULT(no)])
1393  
1394   dnl Check for GCC 3.0 or higher.
1395   HAVE_GCC30=no
1396   AC_MSG_CHECKING(for GCC 3.0 or higher)
1397 < AC_EGREP_CPP(xyes,
1398 < [#if __GNUC__ >= 3
1399 <  xyes
1400 < #endif
1401 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1397 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1398 >                                     # error gcc < 3
1399 >                                     typedef syntax error;
1400 >                                     #endif
1401 >                                   ]])],
1402 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1403 >                  [AC_MSG_RESULT(no)])
1404  
1405   dnl Check for ICC.
1406   AC_MSG_CHECKING(for ICC)
# Line 987 | Line 1411 | fi
1411   AC_MSG_RESULT($HAVE_ICC)
1412  
1413   dnl Determine the generated object format
1414 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1414 > AC_CACHE_CHECK([the format of compiler generated objects],
1415    ac_cv_object_format, [
1416    echo 'int i;' > conftest.$ac_ext
1417    ac_cv_object_format=no
# Line 996 | Line 1420 | AC_CACHE_CHECK([whether the compiler can
1420      *"ELF"*)
1421        ac_cv_object_format=elf
1422        ;;
1423 +    *"Mach-O"*)
1424 +      ac_cv_object_format=mach
1425 +      ;;
1426      *)
1427        ac_cv_object_format=unknown
1428        ;;
# Line 1004 | Line 1431 | AC_CACHE_CHECK([whether the compiler can
1431    rm -rf conftest*
1432   ])
1433  
1434 + dnl Add -fno-strict-aliasing for slirp sources
1435 + if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1436 +  SAVED_CFLAGS="$CFLAGS"
1437 +  CFLAGS="$CFLAGS -fno-strict-aliasing"
1438 +  AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1439 +    ac_cv_gcc_no_strict_aliasing, [
1440 +    AC_TRY_COMPILE([],[],
1441 +      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1442 +      [ac_cv_gcc_no_strict_aliasing=no])
1443 +  ])
1444 +  CFLAGS="$SAVED_CFLAGS"
1445 + fi
1446 +
1447 + dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1448 + if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1449 +  SAVED_CFLAGS="$CFLAGS"
1450 +  CFLAGS="$CFLAGS -mdynamic-no-pic"
1451 +  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1452 +    ac_cv_gcc_mdynamic_no_pic, [
1453 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1454 +  ])
1455 +  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1456 +    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1457 +  else
1458 +    CFLAGS="$SAVED_CFLAGS"
1459 +  fi
1460 + fi
1461 +
1462   dnl CPU emulator sources
1463   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1464    CPUSRCS="\
1465      ../kpx_cpu/src/mathlib/ieeefp.cpp \
1466 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1467      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1468      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1469      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1470 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1470 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1471 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1472    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1473  
1474    dnl Enable JIT compiler, if possible
# Line 1028 | Line 1485 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1485        i?86:elf)
1486          ac_cv_use_dyngen=yes
1487          ;;
1488 +      mips:elf)
1489 +        ac_cv_use_dyngen=yes
1490 +        ;;
1491 +      powerpc:mach)
1492 +        ac_cv_use_dyngen=yes
1493 +        ;;
1494 +      x86_64:mach)
1495 +        ac_cv_use_dyngen=yes
1496 +        ;;
1497 +      i?86:mach)
1498 +        ac_cv_use_dyngen=yes
1499 +        ;;
1500        *:*)
1501          ac_cv_use_dyngen=no
1502          ;;
# Line 1037 | Line 1506 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1506          if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1507            DYNGEN_CC=$CXX
1508          else
1509 <          for p in /usr/bin /usr/local/bin; do
1509 >          for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1510              gxx="$p/g++"
1511              if [[ -x "$gxx" ]]; then
1512                DYNGEN_CC="$gxx"
# Line 1045 | Line 1514 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1514            done
1515          fi
1516        fi
1517 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1517 >      if [[ -z "$DYNGEN_CC" ]]; then
1518          ac_cv_use_dyngen=no
1519        fi
1520      ])
1521      if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1522        case $host_cpu in
1523        i?86)
1524 <        DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1056 <        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1057 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1058 <        else
1059 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1060 <        fi
1061 <        saved_CPPFLAGS=$CPPFLAGS
1062 <        CPPFLAGS="$CPPFLAGS -mmmx"
1063 <        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
1064 <        CPPFLAGS="$CPPFLAGS -msse"
1065 <        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
1066 <        CPPFLAGS="$CPPFLAGS -msse2"
1067 <        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
1068 <        CPPFLAGS=$saved_CPPFLAGS
1524 >        DYNGEN_OP_FLAGS="-fomit-frame-pointer"
1525          ;;
1526 <      x86_64)
1527 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1526 >      mips)
1527 >        DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1528          ;;
1529 +      powerpc)
1530 +        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1531 +          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1532 +        fi
1533 +        ;;
1534 +      esac
1535 +      have_dyngen_gcc3=no
1536 +      case "x`$DYNGEN_CC -dumpversion`" in
1537 +      x[12].*) ;;
1538 +      x*) have_dyngen_gcc3=yes ;;
1539        esac
1540 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -g0"
1541 <      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1540 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1541 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1542 >      else
1543 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1544 >      fi
1545 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1546 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1547          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1548        fi
1549 +      if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1550 +        DYNGEN_CFLAGS="-O2 $CFLAGS"
1551 +        DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1552 +      else
1553 +        DYNGEN_CFLAGS="\$(CFLAGS)"
1554 +        DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1555 +      fi
1556      else
1557        WANT_JIT=no
1558      fi
# Line 1086 | Line 1564 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1564        CPUSRCS="\
1565          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1566          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1567 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1567 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1568 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1569      fi
1570    fi
1571    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1572   else
1573    WANT_JIT=no
1574   fi
1096 if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1097  AC_CACHE_CHECK([whether static data regions are executable],
1098    ac_cv_have_static_data_exec, [
1099    AC_TRY_RUN([int main(void) {
1100 #if defined(__powerpc__)
1101      static unsigned int p[8] = {0x4e800020,};
1102      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1103      asm volatile("sync" : : : "memory");
1104      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1105      asm volatile("sync" : : : "memory");
1106      asm volatile("isync" : : : "memory");
1107      ((void (*)(void))p)();
1108      return 0;
1109 #endif
1110      return 1;
1111    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1112    dnl When cross-compiling, do not assume anything.
1113    ac_cv_have_static_data_exec=no
1114    )
1115  ])
1116 else
1117  ac_cv_use_dyngen=no
1118 fi
1119 AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1120  [Define if your system marks static data pages as executable.])
1121
1575   if [[ "x$WANT_JIT" = "xyes" ]]; then
1576    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1577   fi
1578  
1579 + dnl Higher level optimizations with MIPSPro compilers are possible
1580 + if [[ "x$HAVE_IPA" = "xyes" ]]; then
1581 +  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1582 +  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1583 +  CXXFLAGS="-LANG:std $CXXFLAGS"
1584 +  LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1585 + fi
1586 +
1587 + dnl Check for linker script support
1588 + case $target_os:$target_cpu in
1589 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1590 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1591 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1592 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1593 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1594 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1595 + esac
1596 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1597 +  AC_CACHE_CHECK([whether linker script is usable],
1598 +    ac_cv_linker_script_works, [
1599 +    AC_LANG_SAVE
1600 +    AC_LANG_CPLUSPLUS
1601 +    saved_LDFLAGS="$LDFLAGS"
1602 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1603 +    AC_TRY_RUN(
1604 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1605 +      [ac_cv_linker_script_works=yes],
1606 +      [ac_cv_linker_script_works=no],
1607 +      dnl When cross-compiling, assume it works
1608 +      [ac_cv_linker_script_works="guessing yes"]
1609 +    )
1610 +    AC_LANG_RESTORE
1611 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1612 +      LDFLAGS="$saved_LDFLAGS"
1613 +      LINKER_SCRIPT_FLAGS=""
1614 +    fi
1615 +  ])
1616 + fi
1617 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1618 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1619 +
1620   dnl Generate Makefile.
1621   AC_SUBST(PERL)
1622   AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1623   AC_SUBST(DYNGENSRCS)
1624   AC_SUBST(DYNGEN_CC)
1625 + AC_SUBST(DYNGEN_CFLAGS)
1626 + AC_SUBST(DYNGEN_CXXFLAGS)
1627   AC_SUBST(DYNGEN_OP_FLAGS)
1628   AC_SUBST(SYSSRCS)
1629   AC_SUBST(CPUSRCS)
# Line 1143 | Line 1639 | echo
1639   echo SheepShaver configuration summary:
1640   echo
1641   echo SDL support ...................... : $SDL_SUPPORT
1642 + echo BINCUE support ................... : $have_bincue
1643 + echo LIBVHD support ................... : $have_libvhd
1644 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1645   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1646   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1647   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines