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.72 by gbeauche, 2007-06-07T11:52:14Z vs.
Revision 1.78 by asvitkine, 2010-07-28T01:07:45Z

# Line 26 | Line 26 | dnl SDL options.
26   AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
27   AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
28   AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
29 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
30 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
31  
32   dnl JIT compiler options.
33   AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
# Line 101 | Line 103 | case "$target_cpu" in
103    x86_64* ) HAVE_X86_64=yes;;
104   esac
105  
106 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
107 + if [[ "x$HAVE_I386" = "xyes" ]]; then
108 +  AC_TRY_RUN([
109 +    int main(void) {
110 +        #if defined(__x86_64__)
111 +                return 0;
112 +        #else
113 +                return 1;
114 +        #endif
115 +    }
116 +  ], [
117 +    HAVE_I386=no
118 +    HAVE_X86_64=yes
119 +  ])
120 + fi
121 +
122 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
123 + if [[ "x$HAVE_I386" = "xyes" ]]; then
124 +  AC_TRY_RUN([
125 +    int main(void) {
126 +        #if defined(__x86_64__)
127 +                return 0;
128 +        #else
129 +                return 1;
130 +        #endif
131 +    }
132 +  ], [
133 +    HAVE_I386=no
134 +    HAVE_X86_64=yes
135 +  ])
136 + fi
137 +
138   dnl Checks for programs.
139   AC_PROG_CC
140   AC_PROG_CC_C_O
# Line 121 | Line 155 | if [[ "x$WANT_MON" = "xyes" ]]; then
155      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"
156      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
157      AC_CHECK_LIB(ncurses, tgetent, ,
158 <      AC_CHECK_LIB(termcap, tgetent, ,
159 <        AC_CHECK_LIB(termlib, tgetent, ,
160 <          AC_CHECK_LIB(terminfo, tgetent, ,
161 <            AC_CHECK_LIB(Hcurses, tgetent, ,
162 <              AC_CHECK_LIB(curses, tgetent))))))
158 >      [AC_CHECK_LIB(termcap, tgetent, ,
159 >        [AC_CHECK_LIB(termlib, tgetent, ,
160 >          [AC_CHECK_LIB(terminfo, tgetent, ,
161 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
162 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
163      AC_CHECK_LIB(readline, readline)
164    else
165      AC_MSG_RESULT(no)
# Line 140 | Line 174 | AC_CHECK_LIB(rt, timer_create)
174   AC_CHECK_LIB(rt, shm_open)
175   AC_CHECK_LIB(m, cos)
176  
177 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
178 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
179 + dnl therefore main is undefined with #undef.
180 + dnl Framework can be in an custom location.
181 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
182 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
183 +  AC_CACHE_CHECK([whether compiler supports framework $1],
184 +    ac_Framework, [
185 +    saved_LIBS="$LIBS"
186 +    LIBS="$LIBS -framework $1"
187 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
188 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
189 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
190 +      fi
191 +    fi
192 +    saved_CPPFLAGS="$CPPFLAGS"
193 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
194 +    AC_TRY_LINK(
195 +      [$2
196 + #undef main], [],
197 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
198 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
199 +    )
200 +  ])
201 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
202 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
203 +  )
204 +  AS_VAR_POPDEF([ac_Framework])
205 + ])
206 +
207   dnl Do we need SDL?
208   WANT_SDL=no
209   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 154 | Line 218 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
218    SDL_SUPPORT="$SDL_SUPPORT audio"
219   fi
220   if [[ "x$WANT_SDL" = "xyes" ]]; then
221 <  AC_PATH_PROG(sdl_config, "sdl-config")
222 <  if [[ -n "$sdl_config" ]]; then
159 <    case $target_os in
160 <    # Special treatment for Cygwin so that we can still use the POSIX layer
161 <    *cygwin*)
162 <      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
163 <      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
164 <      ;;
165 <    *)
166 <      sdl_cflags=`$sdl_config --cflags`
167 <      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
168 <        sdl_libs=`$sdl_config --static-libs`
169 <      else
170 <        sdl_libs=`$sdl_config --libs`
171 <      fi
172 <      ;;
173 <    esac
174 <    CFLAGS="$CFLAGS $sdl_cflags"
175 <    CXXFLAGS="$CXXFLAGS $sdl_cflags"
176 <    LIBS="$LIBS $sdl_libs"
221 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
222 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
223    else
224 <    WANT_SDL=no
224 >    ac_cv_framework_SDL=no
225 >  fi
226 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
227 >    AC_PATH_PROG(sdl_config, "sdl-config")
228 >    if [[ -n "$sdl_config" ]]; then
229 >      case $target_os in
230 >      # Special treatment for Cygwin so that we can still use the POSIX layer
231 >      *cygwin*)
232 >        sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
233 >        sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
234 >        ;;
235 >      *)
236 >        sdl_cflags=`$sdl_config --cflags`
237 >        if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
238 >          sdl_libs=`$sdl_config --static-libs`
239 >        else
240 >          sdl_libs=`$sdl_config --libs`
241 >        fi
242 >        ;;
243 >      esac
244 >      CFLAGS="$CFLAGS $sdl_cflags"
245 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
246 >      LIBS="$LIBS $sdl_libs"
247 >    else
248 >      WANT_SDL=no
249 >    fi
250    fi
251    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
252   else
# Line 412 | Line 483 | mips-sony-bsd|mips-sony-newsos4)
483   *-*-cygwin*)
484          no_dev_ptmx=1
485          ;;
486 + *-*-darwin*)
487 +        no_dev_ptmx=1
488 +        ;;
489   esac
490  
491   if test -z "$no_dev_ptmx" ; then
# Line 430 | Line 504 | AC_CHECK_FILE([/dev/ptc],
504                  have_dev_ptc=1
505          ]
506   )
433
507   dnl (end of code from openssh-3.2.2p1 configure.ac)
508  
436
509   dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
510   dnl doesn't work or is unimplemented. On these systems (mostly older
511   dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
# Line 580 | Line 652 | darwin*)
652      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
653    fi
654    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
655 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
655 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
656    fi
657    ;;
658   cygwin*)
# Line 611 | Line 683 | AC_SUBST(SLIRP_SRCS)
683   dnl SDL overrides
684   if [[ "x$WANT_SDL" = "xyes" ]]; then
685    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
686 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
687 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
688 +  fi
689   fi
690   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
691    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
# Line 937 | Line 1012 | AC_CACHE_CHECK([whether your system supp
1012    AC_LANG_SAVE
1013    AC_LANG_CPLUSPLUS
1014    AC_TRY_RUN([
1015 +    #define HAVE_MACH_VM 1
1016 +    #define HAVE_MACH_TASK_SELF 1
1017      #define HAVE_MACH_EXCEPTIONS 1
1018      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
1019      #include "vm_alloc.cpp"
# Line 1279 | Line 1356 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
1356    DEFINES="$DEFINES -DUNALIGNED_PROFITABLE -DREGPARAM=\"__attribute__((regparm(3)))\""
1357    if [[ "x$HAVE_GAS" = "xyes" ]]; then
1358      ASM_OPTIMIZATIONS=i386
1359 <    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTIMIZED_FLAGS -DSAHF_SETO_PROFITABLE"
1359 >    DEFINES="-m32 $DEFINES -DX86_ASSEMBLY -DOPTIMIZED_FLAGS -DSAHF_SETO_PROFITABLE"
1360      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"
1361      CAN_JIT=yes
1362    fi
# Line 1288 | Line 1365 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1365    DEFINES="$DEFINES -DUNALIGNED_PROFITABLE"
1366    if [[ "x$HAVE_GAS" = "xyes" ]]; then
1367      ASM_OPTIMIZATIONS="x86-64"
1368 <    DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1368 >    DEFINES="-m64 $DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1369      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"
1370      CAN_JIT=yes
1371    fi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines