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.34 by gbeauche, 2005-07-03T22:42:48Z vs.
Revision 1.42 by gbeauche, 2005-12-04T16:26:57Z

# 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 125 | Line 125 | AC_SUBST(MONSRCS)
125  
126   dnl Checks for libraries.
127   AC_CHECK_LIB(posix4, sem_init)
128 + AC_CHECK_LIB(m, cos)
129  
130   dnl Do we need SDL?
131   WANT_SDL=no
# Line 452 | Line 453 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
453   dnl Check for some MacOS X frameworks
454   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
455   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
456 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
457  
458   dnl Select system-dependant sources.
459   SERIALSRC=serial_unix.cpp
# Line 466 | Line 468 | linux*)
468    AUDIOSRC=audio_oss_esd.cpp
469    SCSISRC=Linux/scsi_linux.cpp
470    if [[ "x$EMULATED_PPC" = "xno" ]]; then
471 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
471 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
472    fi
473    ;;
474   freebsd*)
# Line 475 | Line 477 | freebsd*)
477   netbsd*)
478    ETHERSRC=ether_unix.cpp
479    if [[ "x$EMULATED_PPC" = "xno" ]]; then
480 <    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
480 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
481    fi
482    ;;
483   darwin*)
484    ETHERSRC=ether_unix.cpp
485    if [[ "x$EMULATED_PPC" = "xno" ]]; then
486 <    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
486 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
487    fi
488 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
488 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
489      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
490    fi
491    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
492      EXTFSSRC=../MacOSX/extfs_macosx.mm
493    fi
494    ;;
495 + irix*)
496 +  ETHERSRC=ether_unix.cpp
497 +  AUDIOSRC=Irix/audio_irix.cpp
498 +  LIBS="$LIBS -laudio"
499 +  WANT_ESD=no
500 +  ;;
501   esac
502  
503   dnl Is the slirp library supported?
# Line 1175 | Line 1183 | fi
1183   dnl Check for GCC 2.7 or higher.
1184   HAVE_GCC27=no
1185   AC_MSG_CHECKING(for GCC 2.7 or higher)
1186 < AC_EGREP_CPP(xyes,
1187 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1188 <  xyes
1189 < #endif
1190 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1186 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1187 >                                     # error gcc < 2.7
1188 >                                     #endif
1189 >                                   ]])],
1190 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1191 >                  [AC_MSG_RESULT(no)])
1192  
1193   dnl Check for GCC 3.0 or higher.
1194   HAVE_GCC30=no
1195   AC_MSG_CHECKING(for GCC 3.0 or higher)
1196 < AC_EGREP_CPP(xyes,
1197 < [#if __GNUC__ >= 3
1198 <  xyes
1199 < #endif
1200 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1196 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1197 >                                     # error gcc < 3
1198 >                                     #endif
1199 >                                   ]])],
1200 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1201 >                  [AC_MSG_RESULT(no)])
1202  
1203   dnl Check for ICC.
1204   AC_MSG_CHECKING(for ICC)
# Line 1232 | Line 1242 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1242    CFLAGS="$SAVED_CFLAGS"
1243   fi
1244  
1245 < dnl Add -mdynamic-no-pic for MacOS X
1246 < if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1245 > dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1246 > if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1247    SAVED_CFLAGS="$CFLAGS"
1248    CFLAGS="$CFLAGS -mdynamic-no-pic"
1249    AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
# Line 1275 | Line 1285 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1285        powerpc:mach)
1286          ac_cv_use_dyngen=yes
1287          ;;
1288 +      i?86:mach)
1289 +        ac_cv_use_dyngen=yes
1290 +        ;;
1291        *:*)
1292          ac_cv_use_dyngen=no
1293          ;;
# Line 1312 | Line 1325 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1325        else
1326          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1327        fi
1328 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1328 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1329        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1330          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1331        fi

Diff Legend

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