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

Comparing BasiliskII/src/Windows/configure.ac (file contents):
Revision 1.3 by gbeauche, 2005-06-20T08:43:50Z vs.
Revision 1.7 by gbeauche, 2007-01-13T18:21:30Z

# Line 11 | Line 11 | dnl Aliases for PACKAGE and VERSION macr
11   AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Define this program name.])
12   AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Define this program version.])
13  
14 + dnl SDL options.
15 + AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
16 +
17   dnl JIT compiler options.
18   AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
19   AC_ARG_ENABLE(jit-debug,     [  --enable-jit-debug      activate native code disassemblers [default=no]], [WANT_JIT_DEBUG=$enableval], [WANT_JIT_DEBUG=no])
# Line 102 | Line 105 | AC_CHECK_TYPES(loff_t)
105   AC_CHECK_TYPES(caddr_t)
106   AC_TYPE_SIZE_T
107  
108 + dnl Checks for library functions.
109 + AC_CHECK_FUNCS(strdup strerror)
110 +
111   dnl Define a macro that translates a yesno-variable into a C macro definition
112   dnl to be put into the config.h file
113   dnl $1 -- the macro to define
# Line 174 | Line 180 | else
180    AC_MSG_ERROR([Sorry, Windows exceptions don't work as expected on your system.])
181   fi
182  
183 + dnl Check if we can ignore the fault (instruction skipping in SIGSEGV handler)
184 + AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler],
185 +  ac_cv_have_skip_instruction, [
186 +  AC_LANG_SAVE
187 +  AC_LANG_CPLUSPLUS
188 +  AC_TRY_RUN([
189 +    #define HAVE_SIGSEGV_SKIP_INSTRUCTION 1
190 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
191 +    #include "../Unix/vm_alloc.cpp"
192 +    #include "../Unix/sigsegv.cpp"
193 +  ], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no,
194 +  dnl When cross-compiling, do not assume anything.
195 +  ac_cv_have_skip_instruction=no
196 +  )
197 +  AC_LANG_RESTORE
198 +  ]
199 + )
200 + AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction",
201 +  [Define if we can ignore the fault (instruction skipping in SIGSEGV handler).])
202 +
203   dnl We really want VOSF (Video on SEGV Signals) screen updates acceleration
204   AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
205  
# Line 236 | Line 262 | AC_EGREP_CPP(xyes,
262   #endif
263   ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
264  
265 + dnl Add -fno-strict-aliasing for slirp sources
266 + if [[ "x$HAVE_GCC30" = "xyes" ]]; then
267 +  SAVED_CFLAGS="$CFLAGS"
268 +  CFLAGS="$CFLAGS -fno-strict-aliasing"
269 +  AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
270 +    ac_cv_gcc_no_strict_aliasing, [
271 +    AC_TRY_COMPILE([],[],
272 +      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
273 +      [ac_cv_gcc_no_strict_aliasing=no])
274 +  ])
275 +  CFLAGS="$SAVED_CFLAGS"
276 + fi
277 +
278   dnl Select appropriate CPU source and REGPARAM define.
279   ASM_OPTIMIZATIONS=none
280   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
# Line 262 | Line 301 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
301      DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
302      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"
303      CAN_JIT=yes
265    WANT_33BIT_ADDRESSING=yes
304    fi
305   fi
306  
# Line 489 | Line 527 | dnl We really want SDL for now
527   AC_CHECK_TOOL(sdl_config, sdl-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])])
528   SDL_CFLAGS=`$sdl_config --cflags`
529   AC_SUBST(SDL_CFLAGS)
530 < SDL_LIBS=`$sdl_config --libs`
530 > if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
531 >  SDL_LIBS=`$sdl_config --static-libs`
532 >  sdl_prefix=`$sdl_config --exec-prefix`
533 >  if [[ -n "$sdl_prefix" ]]; then
534 >    SDL_LIBS=`echo "$SDL_LIBS" | sed -e "s,-l\(SDLmain\|SDL\),$sdl_prefix/lib/lib\1.a,g"`
535 >  fi
536 >  SDL_LIBS="$SDL_LIBS -lwinmm"
537 > else
538 >  SDL_LIBS=`$sdl_config --libs`
539 > fi
540   AC_SUBST(SDL_LIBS)
541   AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
542   AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines