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.52 by gbeauche, 2005-07-01T05:57:07Z vs.
Revision 1.56 by gbeauche, 2005-12-04T15:45:09Z

# Line 136 | Line 136 | dnl Checks for libraries.
136   AC_CHECK_LIB(posix4, sem_init)
137   AC_CHECK_LIB(rt, timer_create)
138   AC_CHECK_LIB(rt, shm_open)
139 + AC_CHECK_LIB(m, cos)
140  
141   dnl Do we need SDL?
142   WANT_SDL=no
# Line 493 | Line 494 | irix*)
494    ETHERSRC=ether_unix.cpp
495    AUDIOSRC=Irix/audio_irix.cpp
496    EXTRASYSSRCS=Irix/unaligned.c
496  dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
497  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
497    LIBS="$LIBS -laudio"
498    WANT_ESD=no
499  
# Line 504 | Line 503 | irix*)
503    CFLAGS=`echo "$CFLAGS -IPA" | sed -e "s/-g//g"`
504    AC_MSG_CHECKING(if "-IPA" works)
505    dnl Do a test compile of an empty function
506 <  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
506 >  AC_TRY_COMPILE([#if defined __GNUC__
507 >                  # error GCC does not support IPA yet
508 >                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
509    CFLAGS="$ocflags"
510    ;;
511   darwin*)
# Line 1113 | Line 1114 | AC_MSG_RESULT($HAVE_GAS)
1114   dnl Check for GCC 2.7 or higher.
1115   HAVE_GCC27=no
1116   AC_MSG_CHECKING(for GCC 2.7 or higher)
1117 < AC_EGREP_CPP(xyes,
1118 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1119 <  xyes
1120 < #endif
1121 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1117 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1118 >                                     # error gcc < 2.7
1119 >                                     #endif
1120 >                                   ]])],
1121 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1122 >                  [AC_MSG_RESULT(no)])
1123  
1124   dnl Check for GCC 3.0 or higher.
1125   HAVE_GCC30=no
1126   AC_MSG_CHECKING(for GCC 3.0 or higher)
1127 < AC_EGREP_CPP(xyes,
1128 < [#if __GNUC__ >= 3
1129 <  xyes
1130 < #endif
1131 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1127 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1128 >                                     # error gcc < 3
1129 >                                     #endif
1130 >                                   ]])],
1131 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1132 >                  [AC_MSG_RESULT(no)])
1133  
1134   dnl Check for ICC.
1135   AC_MSG_CHECKING(for ICC)
# Line 1192 | Line 1195 | if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1195    CFLAGS="$SAVED_CFLAGS"
1196   fi
1197  
1198 < dnl Add -mdynamic-no-pic for MacOS X
1199 < if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1198 > dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1199 > if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1200    SAVED_CFLAGS="$CFLAGS"
1201    CFLAGS="$CFLAGS -mdynamic-no-pic"
1202    AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines