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

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.45 by gbeauche, 2005-05-14T17:40:05Z vs.
Revision 1.74 by asvitkine, 2008-12-09T18:03:35Z

# 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 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
18 +
19   dnl Video options.
20   AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
21   AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
# Line 60 | Line 62 | AC_ARG_ENABLE(addressing,
62  
63   dnl External packages.
64   AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
65 < AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
65 > AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]],
66 >  [case "$withval" in
67 >   gtk1)      WANT_GTK="gtk";;
68 >   gtk|gtk2)  WANT_GTK="$withval";;
69 >   yes)       WANT_GTK="gtk2 gtk";;
70 >   *)         WANT_GTK="no";;
71 >   esac],
72 >  [WANT_GTK="gtk2 gtk"])
73   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
74  
75   dnl Canonical system information.
# Line 109 | Line 118 | if [[ "x$WANT_MON" = "xyes" ]]; then
118    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
119      AC_MSG_RESULT(yes)
120      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
121 <    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
121 >    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/mon_lowmem.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"
122      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
123      AC_CHECK_LIB(ncurses, tgetent, ,
124        AC_CHECK_LIB(termcap, tgetent, ,
# Line 129 | Line 138 | dnl Checks for libraries.
138   AC_CHECK_LIB(posix4, sem_init)
139   AC_CHECK_LIB(rt, timer_create)
140   AC_CHECK_LIB(rt, shm_open)
141 + AC_CHECK_LIB(m, cos)
142  
143   dnl Do we need SDL?
144   WANT_SDL=no
# Line 195 | Line 205 | AC_CHECK_LIB(pthread, pthread_create, ,
205   if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
206    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
207   fi
208 < AC_CHECK_FUNCS(pthread_cancel)
208 > AC_CHECK_FUNCS(pthread_cond_init)
209 > AC_CHECK_FUNCS(pthread_cancel pthread_testcancel)
210   AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
211   AC_CHECK_FUNCS(pthread_mutexattr_settype)
212   AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
# Line 239 | Line 250 | fi
250  
251   dnl We use GTK+ if possible.
252   UISRCS=../dummy/prefs_editor_dummy.cpp
253 < if [[ "x$WANT_GTK" = "xyes" ]]; then
253 > case "x$WANT_GTK" in
254 > xgtk2*)
255 >  AM_PATH_GTK_2_0(1.3.15, [
256 >    GUI_CFLAGS="$GTK_CFLAGS"
257 >    GUI_LIBS="$GTK_LIBS"
258 >    WANT_GTK=gtk2
259 >  ], [
260 >    case "x${WANT_GTK}x" in
261 >    *gtkx)
262 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
263 >      WANT_GTK=gtk
264 >      ;;
265 >    *)
266 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
267 >      WANT_GTK=no
268 >      ;;
269 >    esac
270 >  ])
271 >  ;;
272 > esac
273 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
274    AM_PATH_GTK(1.2.0, [
275 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
276 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
246 <    LIBS="$LIBS $GTK_LIBS"
247 <    UISRCS=prefs_editor_gtk.cpp
275 >    GUI_CFLAGS="$GTK_CFLAGS"
276 >    GUI_LIBS="$GTK_LIBS"
277      dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
278      dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
279      dnl includes <libintl.h>
280      AM_GNU_GETTEXT
281      B2_PATH_GNOMEUI([
282        AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
283 <      CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
284 <      LIBS="$LIBS $GNOMEUI_LIBS"
283 >      GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
284 >      GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
285      ], [])
286    ], [
287      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
288      WANT_GTK=no
289    ])
290   fi
291 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
292 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
293 +  UISRCS=prefs_editor_gtk.cpp
294 + fi
295 + AC_SUBST(GUI_CFLAGS)
296 + AC_SUBST(GUI_LIBS)
297 +
298 + dnl Build external GUI if requested.
299 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
300 +  WANT_STANDALONE_GUI=no
301 + fi
302 + if [[ "$WANT_GTK" = "no" ]]; then
303 +  WANT_STANDALONE_GUI=no
304 + fi
305 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
306  
307   dnl We use ESD if possible.
308   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 278 | Line 322 | AC_SYS_LARGEFILE
322  
323   dnl Checks for header files.
324   AC_HEADER_STDC
325 + AC_CHECK_HEADERS(stdlib.h stdint.h)
326   AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
327   AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
328   AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
# Line 292 | Line 337 | AC_CHECK_HEADERS(linux/if.h linux/if_tun
337   #endif
338   ])
339   AC_CHECK_HEADERS(AvailabilityMacros.h)
340 + AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
341  
342   dnl Checks for typedefs, structures, and compiler characteristics.
343   AC_C_BIGENDIAN
# Line 366 | Line 412 | mips-sony-bsd|mips-sony-newsos4)
412   *-*-cygwin*)
413          no_dev_ptmx=1
414          ;;
415 + *-*-darwin*)
416 +        no_dev_ptmx=1
417 +        ;;
418   esac
419  
420   if test -z "$no_dev_ptmx" ; then
# Line 388 | Line 437 | AC_CHECK_FILE([/dev/ptc],
437   dnl (end of code from openssh-3.2.2p1 configure.ac)
438  
439  
440 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
441 + dnl doesn't work or is unimplemented. On these systems (mostly older
442 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
443 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
444 +  ac_cv_nonblocking_io, [
445 +  case "$host" in
446 +  *-*-osf*)
447 +    ac_cv_nonblocking_io=FIONBIO
448 +    ;;
449 +  *-*-sunos4*)
450 +    ac_cv_nonblocking_io=FIONBIO
451 +    ;;
452 +  *-*-ultrix*)
453 +    ac_cv_nonblocking_io=FIONBIO
454 +    ;;
455 +  *)
456 +    ac_cv_nonblocking_io=O_NONBLOCK
457 +    ;;
458 +  esac
459 + ])
460 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
461 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
462 + fi
463 +
464 + dnl Check whether compiler supports byte bit-fields
465 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
466 +  ac_cv_have_byte_bitfields, [
467 +  AC_LANG_SAVE
468 +  AC_LANG_CPLUSPLUS
469 +  AC_TRY_RUN([
470 +    struct A {
471 +      unsigned char b1:4;
472 +      unsigned char b2:4;
473 +      unsigned char c;
474 +      unsigned short s;
475 +      unsigned char a[4];
476 +    };
477 +
478 +    int main(void) {
479 +      A a;
480 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
481 +    }],
482 +    [ac_cv_have_byte_bitfields=yes],
483 +    [ac_cv_have_byte_bitfields=no],
484 +    dnl When cross-compiling, assume only GCC supports this
485 +    [if [[ "$GCC" = "yes" ]]; then
486 +      ac_cv_have_byte_bitfields="guessing yes"
487 +    else
488 +      ac_cv_have_byte_bitfields="guessing no"
489 +    fi]
490 +    )
491 +  AC_LANG_RESTORE
492 + ])
493 +
494   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
495 < AC_DEFUN(AC_CHECK_FRAMEWORK, [
495 > AC_DEFUN([AC_CHECK_FRAMEWORK], [
496    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
497    AC_CACHE_CHECK([whether compiler supports framework $1],
498      ac_Framework, [
499      saved_LIBS="$LIBS"
500      LIBS="$LIBS -framework $1"
501      AC_TRY_LINK(
502 <      [$2], [int main(void) { return 0; }],
502 >      [$2], [],
503        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
504      )
505    ])
# Line 407 | Line 510 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
510   ])
511  
512   dnl Check for some MacOS X frameworks
513 + AC_CHECK_FRAMEWORK(AppKit, [])
514   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
515   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
516 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
517  
518   dnl Select system-dependant source files.
519   SERIALSRC=serial_unix.cpp
# Line 456 | Line 561 | solaris*)
561    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
562    ;;
563   irix*)
459  ETHERSRC=ether_unix.cpp
564    AUDIOSRC=Irix/audio_irix.cpp
565    EXTRASYSSRCS=Irix/unaligned.c
462  dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
463  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
566    LIBS="$LIBS -laudio"
567    WANT_ESD=no
568  
# Line 470 | Line 572 | irix*)
572    CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
573    AC_MSG_CHECKING(if "-IPA" works)
574    dnl Do a test compile of an empty function
575 <  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
575 >  AC_TRY_COMPILE([#if defined __GNUC__
576 >                  # error GCC does not support IPA yet
577 >                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
578    CFLAGS="$ocflags"
579    ;;
580   darwin*)
581    ETHERSRC=ether_unix.cpp
582 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
582 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
583      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
584    fi
585    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
586 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
586 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
587    fi
588    ;;
589   cygwin*)
# Line 489 | Line 593 | cygwin*)
593   esac
594  
595   dnl Is the slirp library supported?
596 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
596 > case "$ac_cv_have_byte_bitfields" in
597 > yes|"guessing yes")
598 >  CAN_SLIRP=yes
599 >  ETHERSRC=ether_unix.cpp
600 >  ;;
601 > esac
602 > if [[ -n "$CAN_SLIRP" ]]; then
603    AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
604    SLIRP_SRCS="\
605      ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
# Line 552 | Line 662 | dnl to be put into the config.h file
662   dnl $1 -- the macro to define
663   dnl $2 -- the value to translate
664   dnl $3 -- template name
665 < AC_DEFUN(AC_TRANSLATE_DEFINE, [
665 > AC_DEFUN([AC_TRANSLATE_DEFINE], [
666      if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
667          AC_DEFINE($1, 1, $3)
668      fi
# Line 763 | Line 873 | AC_CACHE_CHECK([whether we can map Low M
873    ]
874   )
875  
766 dnl Check if we have POSIX shared memory support
767 AC_CACHE_CHECK([whether POSIX shared memory is working],
768  ac_cv_have_posix_shm, [
769  AC_LANG_SAVE
770  AC_LANG_CPLUSPLUS
771  AC_TRY_RUN([
772    #define HAVE_POSIX_SHM
773    #include "vm_alloc.cpp"
774    int main(void) { /* returns 0 if we have working POSIX shm */
775      if (vm_init() < 0) exit(2);
776      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
777      if (m1 == VM_MAP_FAILED) exit(3);
778      vm_exit(); exit(0);
779    }
780  ], ac_cv_have_posix_shm=yes, ac_cv_have_posix_shm=no,
781  dnl When cross-compiling, do not assume anything.
782  ac_cv_have_posix_shm="guessing no"
783  )
784  AC_LANG_RESTORE
785  ]
786 )
787 AC_TRANSLATE_DEFINE(HAVE_POSIX_SHM, "$ac_cv_have_posix_shm",
788  [Define if your system supports POSIX shared memory.])
789
790 dnl Check if we have working 33-bit memory addressing
791 AC_CACHE_CHECK([whether 33-bit memory addressing is working],
792  ac_cv_have_33bit_addressing, [
793  AC_LANG_SAVE
794  AC_LANG_CPLUSPLUS
795  AC_TRY_RUN([
796    #define USE_33BIT_ADDRESSING 1
797    #include "vm_alloc.cpp"
798    int main(void) { /* returns 0 if we have working 33-bit addressing */
799      if (sizeof(void *) < 8) exit(1);
800      if (vm_init() < 0) exit(2);
801      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
802      if (m1 == VM_MAP_FAILED) exit(3);
803      char *m2 = m1 + (1L << 32);
804      m1[0] = 0x12; if (m2[0] != 0x12) exit(4);
805      m2[0] = 0x34; if (m1[0] != 0x34) exit(5);
806      vm_exit(); exit(0);
807    }
808  ], ac_cv_have_33bit_addressing=yes, ac_cv_have_33bit_addressing=no,
809  dnl When cross-compiling, do not assume anything.
810  ac_cv_have_33bit_addressing="guessing no"
811  )
812  AC_LANG_RESTORE
813  ]
814 )
815
876   dnl Check signal handlers need to be reinstalled
877   AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
878    ac_cv_signal_need_reinstall, [
# Line 1002 | Line 1062 | fi
1062   dnl A dummy program that returns always true
1063   AC_PATH_PROG([BLESS], "true")
1064  
1065 + dnl Check for linker script support
1066 + case $target_os:$target_cpu in
1067 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1068 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1069 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1070 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1071 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1072 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1073 + esac
1074 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1075 +  AC_CACHE_CHECK([whether linker script is usable],
1076 +    ac_cv_linker_script_works, [
1077 +    AC_LANG_SAVE
1078 +    AC_LANG_CPLUSPLUS
1079 +    saved_LDFLAGS="$LDFLAGS"
1080 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1081 +    AC_TRY_RUN(
1082 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1083 +      [ac_cv_linker_script_works=yes],
1084 +      [ac_cv_linker_script_works=no],
1085 +      dnl When cross-compiling, assume it works
1086 +      [ac_cv_linker_script_works="guessing yes"]
1087 +    )
1088 +    AC_LANG_RESTORE
1089 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1090 +      LDFLAGS="$saved_LDFLAGS"
1091 +      LINKER_SCRIPT_FLAGS=""
1092 +    fi
1093 +  ])
1094 + fi
1095 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1096 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1097 +
1098   dnl Determine the addressing mode to use
1099   if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1100    ADDRESSING_MODE="real"
# Line 1079 | Line 1172 | AC_MSG_RESULT($HAVE_GAS)
1172   dnl Check for GCC 2.7 or higher.
1173   HAVE_GCC27=no
1174   AC_MSG_CHECKING(for GCC 2.7 or higher)
1175 < AC_EGREP_CPP(xyes,
1176 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1177 <  xyes
1178 < #endif
1179 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1175 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1176 >                                     # error gcc < 2.7
1177 >                                     #endif
1178 >                                   ]])],
1179 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1180 >                  [AC_MSG_RESULT(no)])
1181  
1182   dnl Check for GCC 3.0 or higher.
1183   HAVE_GCC30=no
1184   AC_MSG_CHECKING(for GCC 3.0 or higher)
1185 < AC_EGREP_CPP(xyes,
1186 < [#if __GNUC__ >= 3
1187 <  xyes
1188 < #endif
1189 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1185 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1186 >                                     # error gcc < 3
1187 >                                     #endif
1188 >                                   ]])],
1189 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1190 >                  [AC_MSG_RESULT(no)])
1191  
1192   dnl Check for ICC.
1193   AC_MSG_CHECKING(for ICC)
# Line 1152 | Line 1247 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1247    AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1248      ac_cv_gcc_no_strict_aliasing, [
1249      AC_TRY_COMPILE([],[],
1250 <      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "$CFLAGS")],
1250 >      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1251        [ac_cv_gcc_no_strict_aliasing=no])
1252    ])
1253    CFLAGS="$SAVED_CFLAGS"
1254   fi
1255  
1256 + dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1257 + if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1258 +  SAVED_CFLAGS="$CFLAGS"
1259 +  CFLAGS="$CFLAGS -mdynamic-no-pic"
1260 +  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1261 +    ac_cv_gcc_mdynamic_no_pic, [
1262 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1263 +  ])
1264 +  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1265 +    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1266 +  else
1267 +    CFLAGS="$SAVED_CFLAGS"
1268 +  fi
1269 + fi
1270 +
1271   dnl Select appropriate CPU source and REGPARAM define.
1272   ASM_OPTIMIZATIONS=none
1273   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
# Line 1184 | Line 1294 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1294      DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1295      JITSRCS="cpuemu1_nf.cpp cpuemu2_nf.cpp cpuemu3_nf.cpp cpuemu4_nf.cpp cpuemu5_nf.cpp cpuemu6_nf.cpp cpuemu7_nf.cpp cpuemu8_nf.cpp $JITSRCS"
1296      CAN_JIT=yes
1187    WANT_33BIT_ADDRESSING=yes
1297    fi
1298   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1299    dnl SPARC CPU
# Line 1241 | Line 1350 | else
1350    JITSRCS=""
1351   fi
1352  
1244 dnl Use 33-bit memory addressing?
1245 if [[ "$ac_cv_have_33bit_addressing:$WANT_33BIT_ADDRESSING" = "yes:yes" ]]; then
1246  use_33bit_addressing=yes
1247 fi
1248 AC_TRANSLATE_DEFINE(USE_33BIT_ADDRESSING, "$use_33bit_addressing",
1249  [Define to use 33-bit memory addressing on 64-bit JIT capable systems.])
1250
1353   dnl Utility macro used by next two tests.
1354   dnl AC_EXAMINE_OBJECT(C source code,
1355   dnl     commands examining object file,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines