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.9 by gbeauche, 2004-11-22T22:51:54Z vs.
Revision 1.68 by asvitkine, 2010-10-06T00:34:15Z

# 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)
# Line 14 | Line 14 | dnl Some systems do not put corefiles in
14   dnl cores for the configure tests since some are intended to dump core.
15   ulimit -c 0
16  
17 + dnl Invite Cygwin users to build within the Windows/ directory
18 + case $target_os in
19 + *cygwin* | *mingw32*)
20 +  AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.])
21 +  ;;
22 + esac
23 +
24   dnl Options.
25   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
26   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
27 + 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])
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=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
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]], [WANT_GTK=$withval], [WANT_GTK=yes])
33 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34 >  [case "$withval" in
35 >   gtk1)      WANT_GTK="gtk";;
36 >   gtk|gtk2)  WANT_GTK="$withval";;
37 >   yes)       WANT_GTK="gtk2 gtk";;
38 >   *)         WANT_GTK="no";;
39 >   esac],
40 >  [WANT_GTK="gtk2 gtk"])
41   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
42   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
43  
44 + AC_ARG_WITH(bincue,  
45 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
46 +
47 +
48   dnl Addressing mode
49   AC_ARG_ENABLE(addressing,
50    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
51    [case "$enableval" in
52     real)        WANT_ADDRESSING_MODE="real";;
53     direct)      WANT_ADDRESSING_MODE="direct";;
54 <   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\)/s//\1/p'`;;
54 >   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;;
55     esac],
56    [WANT_ADDRESSING_MODE="real"]
57   )
# Line 40 | Line 60 | dnl SDL options.
60   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
61   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
62   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
63 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
64 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
65  
66   dnl Checks for programs.
67   AC_PROG_CC
# Line 48 | Line 70 | AC_PROG_CXX
70   AC_PROG_MAKE_SET
71   AC_PROG_INSTALL
72   AC_PROG_EGREP
73 < AC_CHECK_PROGS(FILE, [file false])
73 > AC_PATH_PROGS(FILE, [file false])
74 > AC_PATH_PROG(PERL, [perl])
75  
76   dnl Check for PowerPC target CPU.
77   HAVE_PPC=no
# Line 89 | Line 112 | if [[ "x$WANT_MON" = "xyes" ]]; then
112    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
113      AC_MSG_RESULT(yes)
114      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
115 <    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"
115 >    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"
116      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
117      AC_CHECK_LIB(ncurses, tgetent, ,
118 <      AC_CHECK_LIB(termcap, tgetent, ,
119 <        AC_CHECK_LIB(termlib, tgetent, ,
120 <          AC_CHECK_LIB(terminfo, tgetent, ,
121 <            AC_CHECK_LIB(Hcurses, tgetent, ,
122 <              AC_CHECK_LIB(curses, tgetent))))))
118 >      [AC_CHECK_LIB(termcap, tgetent, ,
119 >        [AC_CHECK_LIB(termlib, tgetent, ,
120 >          [AC_CHECK_LIB(terminfo, tgetent, ,
121 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
122 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
123      AC_CHECK_LIB(readline, readline)
124      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
125    else
# Line 105 | Line 128 | if [[ "x$WANT_MON" = "xyes" ]]; then
128      WANT_MON=no
129    fi
130   fi
131 + AC_SUBST(MONSRCS)
132  
133   dnl Checks for libraries.
134   AC_CHECK_LIB(posix4, sem_init)
135 + AC_CHECK_LIB(m, cos)
136 +
137 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
138 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
139 + dnl therefore main is undefined with #undef.
140 + dnl Framework can be in an custom location.
141 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
142 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
143 +  AC_CACHE_CHECK([whether compiler supports framework $1],
144 +    ac_Framework, [
145 +    saved_LIBS="$LIBS"
146 +    LIBS="$LIBS -framework $1"
147 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
148 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
149 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
150 +      fi
151 +    fi
152 +    saved_CPPFLAGS="$CPPFLAGS"
153 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
154 +    AC_TRY_LINK(
155 +      [$2
156 + #undef main], [],
157 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
158 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
159 +    )
160 +  ])
161 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
162 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
163 +  )
164 +  AS_VAR_POPDEF([ac_Framework])
165 + ])
166  
167   dnl Do we need SDL?
168   WANT_SDL=no
# Line 123 | Line 178 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
178    SDL_SUPPORT="$SDL_SUPPORT audio"
179   fi
180   if [[ "x$WANT_SDL" = "xyes" ]]; then
181 <  AC_PATH_PROG(sdl_config, "sdl-config")
182 <  if [[ -n "$sdl_config" ]]; then
183 <    case $target_os in
184 <    # Special treatment for Cygwin so that we can still use the POSIX layer
185 <    *cygwin*)
186 <      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
187 <      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
188 <      ;;
134 <    *)
181 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
182 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
183 >  else
184 >    ac_cv_framework_SDL=no
185 >  fi
186 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
187 >    AC_PATH_PROG(sdl_config, "sdl-config")
188 >    if [[ -n "$sdl_config" ]]; then
189        sdl_cflags=`$sdl_config --cflags`
190        if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
191          sdl_libs=`$sdl_config --static-libs`
192        else
193          sdl_libs=`$sdl_config --libs`
194        fi
195 <      ;;
196 <    esac
197 <    CFLAGS="$CFLAGS $sdl_cflags"
198 <    CXXFLAGS="$CXXFLAGS $sdl_cflags"
199 <    LIBS="$LIBS $sdl_libs"
200 <  else
201 <    WANT_SDL=no
195 >      CFLAGS="$CFLAGS $sdl_cflags"
196 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
197 >      LIBS="$LIBS $sdl_libs"
198 >    else
199 >      WANT_SDL=no
200 >      WANT_SDL_VIDEO=no
201 >      WANT_SDL_AUDIO=no
202 >    fi
203    fi
204    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
205   else
# Line 152 | Line 207 | else
207   fi
208  
209   dnl We need X11, if not using SDL.
210 < if [[ "x$WANT_SDL" = "xno" ]]; then
210 > if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
211    AC_PATH_XTRA
212    if [[ "x$no_x" = "xyes" ]]; then
213      AC_MSG_ERROR([You need X11 to run SheepShaver.])
# Line 162 | Line 217 | if [[ "x$WANT_SDL" = "xno" ]]; then
217    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
218   fi
219  
220 +
221 +
222   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
223   HAVE_PTHREADS=yes
224   case $EMULATED_PPC:$target_os in
225 < no:linux*)
225 > no:linux*|no:netbsd*)
226    dnl We do have our own pthread_cancel() implementation
227    AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
228    ;;
# Line 173 | Line 230 | no:linux*)
230    AC_CHECK_LIB(pthread, pthread_create, , [
231      AC_CHECK_LIB(c_r, pthread_create, , [
232        AC_CHECK_LIB(PTL, pthread_create, , [
233 <        AC_MSG_ERROR([You need pthreads to run Basilisk II.])
233 >        dnl XXX remove when no pthreads case is merged
234 >        AC_MSG_ERROR([You need pthreads to run SheepShaver.])
235 >        HAVE_PTHREADS=no
236        ])
237      ])
238    ])
239    AC_CHECK_FUNCS(pthread_cancel)
240 +  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
241    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
242    AC_CHECK_FUNCS(pthread_mutexattr_settype)
243    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
184 –  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
185 –    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
186 –  fi
244    dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
245    SEMSRC=
246    AC_CHECK_FUNCS(sem_init, , [
# Line 193 | Line 250 | no:linux*)
250    ])
251    ;;
252   esac
253 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
254 +  AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
255 + fi
256 +
257 + dnl We use FBDev DGA if possible.
258 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
259 +  AC_CHECK_HEADER(linux/fb.h, [
260 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
261 +  ], [
262 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
263 +    WANT_FBDEV_DGA=no
264 +  ])
265 + fi
266  
267   dnl We use XFree86 DGA if possible.
268   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 218 | Line 288 | fi
288  
289   dnl We use GTK+ if possible.
290   UISRCS=../dummy/prefs_editor_dummy.cpp
291 < if [[ "x$WANT_GTK" = "xyes" ]]; then
291 > case "x$WANT_GTK" in
292 > xgtk2*)
293 >  WANT_GTK=no
294 >  AM_PATH_GTK_2_0(1.3.15, [
295 >    GUI_CFLAGS="$GTK_CFLAGS"
296 >    GUI_LIBS="$GTK_LIBS"
297 >    WANT_GTK=gtk2
298 >  ], [
299 >    case "x${WANT_GTK}x" in
300 >    *gtkx)
301 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
302 >      WANT_GTK=gtk
303 >      ;;
304 >    *)
305 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
306 >      WANT_GTK=no
307 >     ;;
308 >    esac
309 >  ])
310 >  ;;
311 > esac
312 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
313 >  WANT_GTK=no
314    AM_PATH_GTK(1.2.0, [
315 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
316 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
317 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
226 <    LIBS="$LIBS $GTK_LIBS"
227 <    UISRCS=prefs_editor_gtk.cpp
315 >    GUI_CFLAGS="$GTK_CFLAGS"
316 >    GUI_LIBS="$GTK_LIBS"
317 >    WANT_GTK=gtk
318    ], [
319      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
230 –    WANT_GTK=no
320    ])
321   fi
322 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
323 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
324 +  UISRCS=prefs_editor_gtk.cpp
325 + fi
326 + AC_SUBST(GUI_CFLAGS)
327 + AC_SUBST(GUI_LIBS)
328 +
329 + dnl Build external GUI if requested.
330 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
331 +  WANT_STANDALONE_GUI=no
332 + fi
333 + if [[ "$WANT_GTK" = "no" ]]; then
334 +  WANT_STANDALONE_GUI=no
335 + fi
336 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
337  
338   dnl We use ESD if possible.
339   if [[ "x$WANT_ESD" = "xyes" ]]; then
340 +  WANT_ESD=no
341    AM_PATH_ESD(0.2.8, [
342      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
343      CFLAGS="$CFLAGS $ESD_CFLAGS"
344      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
345      LIBS="$LIBS $ESD_LIBS"
346 +    WANT_ESD=yes
347    ], [
348      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
243 –    WANT_ESD=no
349    ])
350   fi
351  
# Line 250 | Line 355 | AC_SYS_LARGEFILE
355   dnl Checks for header files.
356   AC_HEADER_STDC
357   AC_HEADER_SYS_WAIT
358 < AC_CHECK_HEADERS(malloc.h)
358 > AC_CHECK_HEADERS(malloc.h stdint.h)
359   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
255 – AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
360   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
361 < AC_CHECK_HEADERS(linux/if.h, [], [], [
362 < #if HAVE_SYS_SOCKET_H
363 < # include <sys/socket.h>
361 > AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
362 > AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
363 > AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
364 > #ifdef HAVE_SYS_TYPES_H
365 > #include <sys/types.h>
366 > #endif
367 > #ifdef HAVE_SYS_SOCKET_H
368 > #include <sys/socket.h>
369   #endif
370   ])
371 < AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
371 > AC_CHECK_HEADERS(AvailabilityMacros.h)
372 > AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
373 > AC_CHECK_HEADERS(fenv.h)
374  
375   dnl Checks for typedefs, structures, and compiler characteristics.
376   AC_C_BIGENDIAN
# Line 279 | Line 390 | AC_TYPE_SIGNAL
390   AC_HEADER_TIME
391   AC_STRUCT_TM
392  
393 + dnl Check whether sys/socket.h defines type socklen_t.
394 + dnl (extracted from ac-archive/Miscellaneous)
395 + AC_CACHE_CHECK([for socklen_t],
396 +  ac_cv_type_socklen_t, [
397 +  AC_TRY_COMPILE([
398 +    #include <sys/types.h>
399 +    #include <sys/socket.h>
400 +  ], [socklen_t len = 42; return 0;],
401 +  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
402 +  dnl When cross-compiling, do not assume anything.
403 +  ac_cv_type_socklen_t="guessing no"
404 +  )
405 + ])
406 + if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
407 +  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
408 + fi
409 +
410   dnl Check whether struct sigaction has sa_restorer member.
411   AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
412    ac_cv_signal_sa_restorer, [
# Line 295 | Line 423 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
423   fi
424  
425   dnl Checks for library functions.
426 < AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
426 > AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
427   AC_CHECK_FUNCS(nanosleep)
428   AC_CHECK_FUNCS(sigaction signal)
429   AC_CHECK_FUNCS(mmap mprotect munmap)
430   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
431 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
431 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
432 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
433 > AC_CHECK_FUNCS(poll inet_aton)
434  
435   dnl Darwin seems to define mach_task_self() instead of task_self().
436   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 312 | Line 442 | no:linux*)
442    ;;
443   *:*)
444    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
445 <  AC_CHECK_FUNCS(clock_gettime)
445 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
446    ;;
447   esac
448  
# Line 340 | Line 470 | mips-sony-bsd|mips-sony-newsos4)
470   *-*-cygwin*)
471          no_dev_ptmx=1
472          ;;
473 + *-*-darwin*)
474 +        no_dev_ptmx=1
475 +        ;;
476   esac
477  
478   if test -z "$no_dev_ptmx" ; then
# Line 360 | Line 493 | AC_CHECK_FILE([/dev/ptc],
493   )
494   dnl (end of code from openssh-3.2.2p1 configure.ac)
495  
496 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
497 + dnl doesn't work or is unimplemented. On these systems (mostly older
498 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
499 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
500 +  ac_cv_nonblocking_io, [
501 +  case "$host" in
502 +  *-*-osf*)
503 +    ac_cv_nonblocking_io=FIONBIO
504 +    ;;
505 +  *-*-sunos4*)
506 +    ac_cv_nonblocking_io=FIONBIO
507 +    ;;
508 +  *-*-ultrix*)
509 +    ac_cv_nonblocking_io=FIONBIO
510 +    ;;
511 +  *)
512 +    ac_cv_nonblocking_io=O_NONBLOCK
513 +    ;;
514 +  esac
515 + ])
516 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
517 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
518 + fi
519 +
520 + dnl Check whether compiler supports byte bit-fields
521 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
522 +  ac_cv_have_byte_bitfields, [
523 +  AC_LANG_SAVE
524 +  AC_LANG_CPLUSPLUS
525 +  AC_TRY_RUN([
526 +    struct A {
527 +      unsigned char b1:4;
528 +      unsigned char b2:4;
529 +      unsigned char c;
530 +      unsigned short s;
531 +      unsigned char a[4];
532 +    };
533 +
534 +    int main(void) {
535 +      A a;
536 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
537 +    }],
538 +    [ac_cv_have_byte_bitfields=yes],
539 +    [ac_cv_have_byte_bitfields=no],
540 +    dnl When cross-compiling, assume only GCC supports this
541 +    [if [[ "$GCC" = "yes" ]]; then
542 +      ac_cv_have_byte_bitfields="guessing yes"
543 +    else
544 +      ac_cv_have_byte_bitfields="guessing no"
545 +    fi]
546 +    )
547 +  AC_LANG_RESTORE
548 + ])
549 +
550   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
551 < AC_DEFUN(AC_CHECK_FRAMEWORK, [
551 > AC_DEFUN([AC_CHECK_FRAMEWORK], [
552    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
553    AC_CACHE_CHECK([whether compiler supports framework $1],
554      ac_Framework, [
555      saved_LIBS="$LIBS"
556      LIBS="$LIBS -framework $1"
557      AC_TRY_LINK(
558 <      [$2], [int main(void) { return 0; }],
558 >      [$2], [],
559        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
560      )
561    ])
# Line 381 | Line 568 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
568   dnl Check for some MacOS X frameworks
569   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
570   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
571 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
572 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
573 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
574 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
575 + AC_CHECK_FRAMEWORK(AppKit, [])
576  
577   dnl Select system-dependant sources.
578   SERIALSRC=serial_unix.cpp
579   ETHERSRC=../dummy/ether_dummy.cpp
580   SCSISRC=../dummy/scsi_dummy.cpp
581   AUDIOSRC=../dummy/audio_dummy.cpp
582 + PREFSSRC=../dummy/prefs_dummy.cpp
583   EXTFSSRC=extfs_unix.cpp
584   EXTRASYSSRCS=
585   case "$target_os" in
586   linux*)
587 <  ETHERSRC=Linux/ether_linux.cpp
587 >  ETHERSRC=ether_unix.cpp
588    AUDIOSRC=audio_oss_esd.cpp
589    SCSISRC=Linux/scsi_linux.cpp
590    if [[ "x$EMULATED_PPC" = "xno" ]]; then
591 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
591 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
592 >  fi
593 >  ;;
594 > freebsd*)
595 >  ETHERSRC=ether_unix.cpp
596 >  ;;
597 > netbsd*)
598 >  ETHERSRC=ether_unix.cpp
599 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
600 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
601    fi
602    ;;
603   darwin*)
604 +  ETHERSRC=ether_unix.cpp
605    if [[ "x$EMULATED_PPC" = "xno" ]]; then
606 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
606 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
607    fi
608 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
608 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
609      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
610    fi
611    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
612 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
612 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
613 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
614 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
615 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
616 >    fi
617 >  fi
618 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
619 >    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
620 >    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
621    fi
622    ;;
623 < cygwin*)
624 <  SERIALSRC="../dummy/serial_dummy.cpp"
623 > irix*)
624 >  AUDIOSRC=Irix/audio_irix.cpp
625 >  LIBS="$LIBS -laudio"
626 >  WANT_ESD=no
627 >
628 >  dnl Check if our compiler supports -IPA (MIPSPro)
629 >  HAVE_IPA=no
630 >  ocflags="$CFLAGS"
631 >  CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
632 >  AC_MSG_CHECKING(if "-IPA" works)
633 >  dnl Do a test compile of an empty function
634 >  AC_TRY_COMPILE([#if defined __GNUC__
635 >                  # error GCC does not support IPA yet
636 >                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
637 >  CFLAGS="$ocflags"
638    ;;
639   esac
640  
641 + dnl BINCUE
642 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
643 + AS_IF([test  "x$have_bincue" = "xyes" ], [
644 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
645 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
646 +   else
647 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
648 +   fi
649 + ])
650 +
651 +
652 + dnl Is the slirp library supported?
653 + case "$ac_cv_have_byte_bitfields" in
654 + yes|"guessing yes")
655 +  CAN_SLIRP=yes
656 +  ETHERSRC=ether_unix.cpp
657 +  ;;
658 + esac
659 + if [[ -n "$CAN_SLIRP" ]]; then
660 +  AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
661 +  SLIRP_SRCS="\
662 +    ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
663 +    ../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
664 +    ../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
665 +    ../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
666 +    ../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
667 +    ../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
668 + fi
669 + AC_SUBST(SLIRP_SRCS)
670 +
671   dnl SDL overrides
672   if [[ "x$WANT_SDL" = "xyes" ]]; then
673    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
674 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
675 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
676 +  fi
677   fi
678   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
679    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 425 | Line 682 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
682    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
683      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
684    else
685 <    case "$target_os" in
429 <    cygwin*)
430 <      EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
431 <      ;;
432 <    *)
433 <      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
434 <      ;;
435 <    esac
685 >    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
686    fi
687   else
688    VIDEOSRCS="video_x.cpp"
# Line 444 | Line 694 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
694    AUDIOSRC="../SDL/audio_sdl.cpp"
695   fi
696  
697 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
697 > dnl BINCUE overrides
698 >
699 > if [[ "x$have_bincue" = "xyes" ]]; then
700 >  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
701 > fi
702 >
703 >
704 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
705  
706   dnl Define a macro that translates a yesno-variable into a C macro definition
707   dnl to be put into the config.h file
708   dnl $1 -- the macro to define
709   dnl $2 -- the value to translate
710   dnl $3 -- template name
711 < AC_DEFUN(AC_TRANSLATE_DEFINE, [
711 > AC_DEFUN([AC_TRANSLATE_DEFINE], [
712      if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
713          AC_DEFINE($1, 1, $3)
714      fi
# Line 860 | Line 1117 | fi
1117  
1118   dnl Check addressing mode to use
1119   AC_MSG_CHECKING([for addressing mode to use])
863 – case "$os_target" in
864 – cygwin*)
865 –  WANT_ADDRESSING_MODE="direct,cygwin-hack"
866 –  NATMEM_OFFSET=
867 –  ;;
868 – esac
1120   if [[ "$EMULATED_PPC" != "yes" ]]; then
1121    if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
1122      AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
# Line 916 | Line 1167 | int main(void)
1167                  memset(m, 0, ranges[[i]].size);
1168                  vm_release(m, ranges[[i]].size);
1169                  if (i == n_ranges - 1) {
1170 <                        printf("0x%08x\n", ofs);
1170 >                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
1171 >                                printf("0x%lxul\n", ofs);
1172 >                        else
1173 >                                printf("0x%08x\n", ofs);
1174                          return 0;
1175                  }
1176          }
# Line 944 | Line 1198 | EOF
1198   fi
1199   AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1200  
1201 + dnl Utility macro used by next two tests.
1202 + dnl AC_EXAMINE_OBJECT(C source code,
1203 + dnl     commands examining object file,
1204 + dnl     [commands to run if compile failed]):
1205 + dnl
1206 + dnl Compile the source code to an object file; then convert it into a
1207 + dnl printable representation.  All unprintable characters and
1208 + dnl asterisks (*) are replaced by dots (.).  All white space is
1209 + dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1210 + dnl output, but runs of newlines are compressed to a single newline.
1211 + dnl Finally, line breaks are forcibly inserted so that no line is
1212 + dnl longer than 80 columns and the file ends with a newline.  The
1213 + dnl result of all this processing is in the file conftest.dmp, which
1214 + dnl may be examined by the commands in the second argument.
1215 + dnl
1216 + AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1217 + [AC_LANG_SAVE
1218 + AC_LANG_C
1219 + dnl Next bit cribbed from AC_TRY_COMPILE.
1220 + cat > conftest.$ac_ext <<EOF
1221 + [#line __oline__ "configure"
1222 + #include "confdefs.h"
1223 + $1
1224 + ]EOF
1225 + if AC_TRY_EVAL(ac_compile); then
1226 +  od -c conftest.o |
1227 +    sed ['s/^[0-7]*[    ]*/ /
1228 +          s/\*/./g
1229 +          s/ \\n/*/g
1230 +          s/ [0-9][0-9][0-9]/./g
1231 +          s/  \\[^ ]/./g'] |
1232 +    tr -d '
1233 + ' | tr -s '*' '
1234 + ' | fold | sed '$a\
1235 + ' > conftest.dmp
1236 +  $2
1237 + ifelse($3, , , else
1238 +  $3
1239 + )dnl
1240 + fi
1241 + rm -rf conftest*
1242 + AC_LANG_RESTORE])
1243 +
1244 + dnl Floating point format probe.
1245 + dnl The basic concept is the same as the above: grep the object
1246 + dnl file for an interesting string.  We have to watch out for
1247 + dnl rounding changing the values in the object, however; this is
1248 + dnl handled by ignoring the least significant byte of the float.
1249 + dnl
1250 + dnl Does not know about VAX G-float or C4x idiosyncratic format.
1251 + dnl It does know about PDP-10 idiosyncratic format, but this is
1252 + dnl not presently supported by GCC.  S/390 "binary floating point"
1253 + dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1254 + dnl as ASCII?)
1255 + dnl
1256 + AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1257 + [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1258 + [gcc_AC_EXAMINE_OBJECT(
1259 + [/* This will not work unless sizeof(double) == 8.  */
1260 + extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1261 +
1262 + /* This structure must have no internal padding.  */
1263 + struct possibility {
1264 +  char prefix[8];
1265 +  double candidate;
1266 +  char postfix[8];
1267 + };
1268 +
1269 + #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1270 + struct possibility table [] =
1271 + {
1272 +  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1273 +  C( 3.53802595280598432000e+18), /* D__float - VAX */
1274 +  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1275 +  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1276 +  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1277 + };],
1278 + [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1279 +    ac_cv_c_float_format='IEEE (big-endian)'
1280 +  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1281 +    ac_cv_c_float_format='IEEE (big-endian)'
1282 +  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1283 +    ac_cv_c_float_format='IEEE (little-endian)'
1284 +  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1285 +    ac_cv_c_float_format='IEEE (little-endian)'
1286 +  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1287 +    ac_cv_c_float_format='VAX D-float'
1288 +  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1289 +    ac_cv_c_float_format='PDP-10'
1290 +  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1291 +    ac_cv_c_float_format='IBM 370 hex'
1292 +  else
1293 +    AC_MSG_ERROR(Unknown floating point format)
1294 +  fi],
1295 +  [AC_MSG_ERROR(compile failed)])
1296 + ])
1297 + # IEEE is the default format.  If the float endianness isn't the same
1298 + # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1299 + # (which is a tristate: yes, no, default).  This is only an issue with
1300 + # IEEE; the other formats are only supported by a few machines each,
1301 + # all with the same endianness.
1302 + format=IEEE_FLOAT_FORMAT
1303 + fbigend=
1304 + case $ac_cv_c_float_format in
1305 +    'IEEE (big-endian)' )
1306 +        if test $ac_cv_c_bigendian = no; then
1307 +            fbigend=1
1308 +        fi
1309 +        ;;
1310 +    'IEEE (little-endian)' )
1311 +        if test $ac_cv_c_bigendian = yes; then
1312 +            fbigend=0
1313 +        fi
1314 +        ;;
1315 +    'VAX D-float' )
1316 +        format=VAX_FLOAT_FORMAT
1317 +        ;;
1318 +    'PDP-10' )
1319 +        format=PDP10_FLOAT_FORMAT
1320 +        ;;
1321 +    'IBM 370 hex' )
1322 +        format=IBM_FLOAT_FORMAT
1323 +        ;;
1324 + esac
1325 + AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1326 +  [Define to the floating point format of the host machine.])
1327 + if test -n "$fbigend"; then
1328 +        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1329 +  [Define to 1 if the host machine stores floating point numbers in
1330 +   memory with the word containing the sign bit at the lowest address,
1331 +   or to 0 if it does it the other way around.
1332 +
1333 +   This macro should not be defined if the ordering is the same as for
1334 +   multi-word integers.])
1335 + fi
1336 + ])
1337 +
1338 + dnl Check for host float format
1339 + gcc_AC_C_FLOAT_FORMAT
1340 +
1341   dnl Platform specific binary postprocessor
1342   AC_PATH_PROG(BLESS, "true")
1343   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
# Line 954 | Line 1348 | fi
1348   dnl Check for GCC 2.7 or higher.
1349   HAVE_GCC27=no
1350   AC_MSG_CHECKING(for GCC 2.7 or higher)
1351 < AC_EGREP_CPP(xyes,
1352 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1353 <  xyes
1354 < #endif
1355 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1351 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1352 >                                     # error gcc < 2.7
1353 >                                     typedef syntax error;
1354 >                                     #endif
1355 >                                   ]])],
1356 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1357 >                  [AC_MSG_RESULT(no)])
1358  
1359   dnl Check for GCC 3.0 or higher.
1360   HAVE_GCC30=no
1361   AC_MSG_CHECKING(for GCC 3.0 or higher)
1362 < AC_EGREP_CPP(xyes,
1363 < [#if __GNUC__ >= 3
1364 <  xyes
1365 < #endif
1366 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1362 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1363 >                                     # error gcc < 3
1364 >                                     typedef syntax error;
1365 >                                     #endif
1366 >                                   ]])],
1367 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1368 >                  [AC_MSG_RESULT(no)])
1369  
1370   dnl Check for ICC.
1371   AC_MSG_CHECKING(for ICC)
# Line 978 | Line 1376 | fi
1376   AC_MSG_RESULT($HAVE_ICC)
1377  
1378   dnl Determine the generated object format
1379 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1379 > AC_CACHE_CHECK([the format of compiler generated objects],
1380    ac_cv_object_format, [
1381    echo 'int i;' > conftest.$ac_ext
1382    ac_cv_object_format=no
# Line 987 | Line 1385 | AC_CACHE_CHECK([whether the compiler can
1385      *"ELF"*)
1386        ac_cv_object_format=elf
1387        ;;
1388 +    *"Mach-O"*)
1389 +      ac_cv_object_format=mach
1390 +      ;;
1391      *)
1392        ac_cv_object_format=unknown
1393        ;;
# Line 995 | Line 1396 | AC_CACHE_CHECK([whether the compiler can
1396    rm -rf conftest*
1397   ])
1398  
1399 + dnl Add -fno-strict-aliasing for slirp sources
1400 + if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1401 +  SAVED_CFLAGS="$CFLAGS"
1402 +  CFLAGS="$CFLAGS -fno-strict-aliasing"
1403 +  AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1404 +    ac_cv_gcc_no_strict_aliasing, [
1405 +    AC_TRY_COMPILE([],[],
1406 +      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1407 +      [ac_cv_gcc_no_strict_aliasing=no])
1408 +  ])
1409 +  CFLAGS="$SAVED_CFLAGS"
1410 + fi
1411 +
1412 + dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1413 + if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1414 +  SAVED_CFLAGS="$CFLAGS"
1415 +  CFLAGS="$CFLAGS -mdynamic-no-pic"
1416 +  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1417 +    ac_cv_gcc_mdynamic_no_pic, [
1418 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1419 +  ])
1420 +  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1421 +    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1422 +  else
1423 +    CFLAGS="$SAVED_CFLAGS"
1424 +  fi
1425 + fi
1426 +
1427   dnl CPU emulator sources
1428   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1429    CPUSRCS="\
1430      ../kpx_cpu/src/mathlib/ieeefp.cpp \
1431 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1432      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1433      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1434      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1435 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1435 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1436 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1437    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1438  
1439    dnl Enable JIT compiler, if possible
# Line 1019 | Line 1450 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1450        i?86:elf)
1451          ac_cv_use_dyngen=yes
1452          ;;
1453 +      mips:elf)
1454 +        ac_cv_use_dyngen=yes
1455 +        ;;
1456 +      powerpc:mach)
1457 +        ac_cv_use_dyngen=yes
1458 +        ;;
1459 +      i?86:mach)
1460 +        ac_cv_use_dyngen=yes
1461 +        ;;
1462        *:*)
1463          ac_cv_use_dyngen=no
1464          ;;
# Line 1028 | Line 1468 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1468          if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1469            DYNGEN_CC=$CXX
1470          else
1471 <          for p in /usr/bin /usr/local/bin; do
1471 >          for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1472              gxx="$p/g++"
1473              if [[ -x "$gxx" ]]; then
1474                DYNGEN_CC="$gxx"
# Line 1036 | Line 1476 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1476            done
1477          fi
1478        fi
1479 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1479 >      if [[ -z "$DYNGEN_CC" ]]; then
1480          ac_cv_use_dyngen=no
1481        fi
1482      ])
1483      if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1484        case $host_cpu in
1485        i?86)
1486 <        DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1487 <        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1488 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1489 <        else
1050 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1051 <        fi
1052 <        saved_CPPFLAGS=$CPPFLAGS
1053 <        CPPFLAGS="$CPPFLAGS -mmmx"
1054 <        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
1055 <        CPPFLAGS="$CPPFLAGS -msse"
1056 <        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
1057 <        CPPFLAGS="$CPPFLAGS -msse2"
1058 <        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
1059 <        CPPFLAGS=$saved_CPPFLAGS
1486 >        DYNGEN_OP_FLAGS="-fomit-frame-pointer"
1487 >        ;;
1488 >      mips)
1489 >        DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1490          ;;
1491 <      x86_64)
1492 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1491 >      powerpc)
1492 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1493 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1494 >        fi
1495          ;;
1496        esac
1497 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1498 <      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1497 >      have_dyngen_gcc3=no
1498 >      case "x`$DYNGEN_CC -dumpversion`" in
1499 >      x[12].*) ;;
1500 >      x*) have_dyngen_gcc3=yes ;;
1501 >      esac
1502 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1503 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1504 >      else
1505 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1506 >      fi
1507 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1508 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1509          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1510        fi
1511 +      if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1512 +        DYNGEN_CFLAGS="-O2 $CFLAGS"
1513 +        DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1514 +      else
1515 +        DYNGEN_CFLAGS="\$(CFLAGS)"
1516 +        DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1517 +      fi
1518      else
1519        WANT_JIT=no
1520      fi
# Line 1077 | Line 1526 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1526        CPUSRCS="\
1527          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1528          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1529 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1529 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1530 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1531      fi
1532    fi
1533    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1534   else
1535    WANT_JIT=no
1536   fi
1087 – if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1088 –  AC_CACHE_CHECK([whether static data regions are executable],
1089 –    ac_cv_have_static_data_exec, [
1090 –    AC_TRY_RUN([int main(void) {
1091 – #if defined(__powerpc__)
1092 –      static unsigned int p[8] = {0x4e800020,};
1093 –      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1094 –      asm volatile("sync" : : : "memory");
1095 –      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1096 –      asm volatile("sync" : : : "memory");
1097 –      asm volatile("isync" : : : "memory");
1098 –      ((void (*)(void))p)();
1099 –      return 0;
1100 – #endif
1101 –      return 1;
1102 –    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1103 –    dnl When cross-compiling, do not assume anything.
1104 –    ac_cv_have_static_data_exec=no
1105 –    )
1106 –  ])
1107 – fi
1108 – AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1109 –  [Define if your system marks static data pages as executable.])
1110 –
1537   if [[ "x$WANT_JIT" = "xyes" ]]; then
1538    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1539   fi
1540  
1541 + dnl Higher level optimizations with MIPSPro compilers are possible
1542 + if [[ "x$HAVE_IPA" = "xyes" ]]; then
1543 +  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1544 +  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1545 +  CXXFLAGS="-LANG:std $CXXFLAGS"
1546 +  LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1547 + fi
1548 +
1549 + dnl Check for linker script support
1550 + case $target_os:$target_cpu in
1551 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1552 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1553 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1554 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1555 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1556 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1557 + esac
1558 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1559 +  AC_CACHE_CHECK([whether linker script is usable],
1560 +    ac_cv_linker_script_works, [
1561 +    AC_LANG_SAVE
1562 +    AC_LANG_CPLUSPLUS
1563 +    saved_LDFLAGS="$LDFLAGS"
1564 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1565 +    AC_TRY_RUN(
1566 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1567 +      [ac_cv_linker_script_works=yes],
1568 +      [ac_cv_linker_script_works=no],
1569 +      dnl When cross-compiling, assume it works
1570 +      [ac_cv_linker_script_works="guessing yes"]
1571 +    )
1572 +    AC_LANG_RESTORE
1573 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1574 +      LDFLAGS="$saved_LDFLAGS"
1575 +      LINKER_SCRIPT_FLAGS=""
1576 +    fi
1577 +  ])
1578 + fi
1579 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1580 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1581 +
1582   dnl Generate Makefile.
1583 + AC_SUBST(PERL)
1584 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1585   AC_SUBST(DYNGENSRCS)
1586   AC_SUBST(DYNGEN_CC)
1587 + AC_SUBST(DYNGEN_CFLAGS)
1588 + AC_SUBST(DYNGEN_CXXFLAGS)
1589   AC_SUBST(DYNGEN_OP_FLAGS)
1590   AC_SUBST(SYSSRCS)
1591   AC_SUBST(CPUSRCS)
# Line 1130 | Line 1601 | echo
1601   echo SheepShaver configuration summary:
1602   echo
1603   echo SDL support ...................... : $SDL_SUPPORT
1604 + echo BINCUE support ................... : $have_bincue
1605 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1606   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1607   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1608   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

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