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.34 by gbeauche, 2004-11-08T21:07:07Z vs.
Revision 1.38 by gbeauche, 2004-11-17T00:59:04Z

# Line 98 | Line 98 | AC_PROG_CPP
98   AC_PROG_CXX
99   AC_PROG_MAKE_SET
100   AC_PROG_INSTALL
101 + AC_PROG_EGREP
102  
103   dnl We use mon if possible.
104   MONSRCS=
# Line 144 | Line 145 | fi
145   if [[ "x$WANT_SDL" = "xyes" ]]; then
146    AC_PATH_PROG(sdl_config, "sdl-config")
147    if [[ -n "$sdl_config" ]]; then
148 <    sdl_cflags=`$sdl_config --cflags`
149 <    sdl_libs=`$sdl_config --libs`
148 >    case $target_os in
149 >    # Special treatment for Cygwin so that we can still use the POSIX layer
150 >    *cygwin*)
151 >      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
152 >      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
153 >      ;;
154 >    *)
155 >      sdl_cflags=`$sdl_config --cflags`
156 >      sdl_libs=`$sdl_config --libs`
157 >      ;;
158 >    esac
159      CFLAGS="$CFLAGS $sdl_cflags"
160      CXXFLAGS="$CXXFLAGS $sdl_cflags"
161      LIBS="$LIBS $sdl_libs"
# Line 265 | Line 275 | dnl Checks for header files.
275   AC_HEADER_STDC
276   AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
277   AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
278 < AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h)
278 > AC_CHECK_HEADERS(sys/socket.h)
279 > AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
280 > #ifdef HAVE_SYS_SOCKET_H
281 > #include <sys/socket.h>
282 > #endif
283 > ])
284   AC_CHECK_HEADERS(AvailabilityMacros.h)
285  
286   dnl Checks for typedefs, structures, and compiler characteristics.
# Line 337 | Line 352 | mips-sony-bsd|mips-sony-newsos4)
352   *-*-sco3.2v5*)
353          no_dev_ptmx=1
354          ;;
355 + *-*-cygwin*)
356 +        no_dev_ptmx=1
357 +        ;;
358   esac
359  
360   if test -z "$no_dev_ptmx" ; then
# Line 447 | Line 465 | darwin*)
465      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
466    fi
467    ;;
468 + cygwin*)
469 +  SERIALSRC="../dummy/serial_dummy.cpp"
470 +  EXTRASYSSRCS="../Windows/BasiliskII.rc"
471 +  ;;
472   esac
473   dnl SDL overrides
474   if [[ "x$WANT_SDL" = "xyes" ]]; then
# Line 459 | Line 481 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
481    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
482      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
483    else
484 <    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
484 >    case "$target_os" in
485 >    cygwin*)
486 >      EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
487 >      ;;
488 >    *)
489 >      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
490 >      ;;
491 >    esac
492    fi
493   else
494    VIDEOSRCS="video_x.cpp"
# Line 838 | Line 867 | AC_CACHE_CHECK([whether your system supp
867   AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
868    [Define if your system supports Mach exceptions.])
869  
870 + dnl Check if Windows exceptions are supported.
871 + AC_CACHE_CHECK([whether your system supports Windows exceptions],
872 +  ac_cv_have_win32_exceptions, [
873 +  AC_LANG_SAVE
874 +  AC_LANG_CPLUSPLUS
875 +  AC_TRY_RUN([
876 +    #define HAVE_WIN32_EXCEPTIONS 1
877 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
878 +    #include "vm_alloc.cpp"
879 +    #include "sigsegv.cpp"
880 +  ], [
881 +  sigsegv_recovery=win32
882 +  ac_cv_have_win32_exceptions=yes
883 +  ],
884 +  ac_cv_have_win32_exceptions=no,
885 +  dnl When cross-compiling, do not assume anything.
886 +  ac_cv_have_win32_exceptions=no
887 +  )
888 +  AC_LANG_RESTORE
889 +  ]
890 + )
891 + AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
892 +  [Define if your system supports Windows exceptions.])
893 +
894   dnl Otherwise, check if extended signals are supported.
895   if [[ -z "$sigsegv_recovery" ]]; then
896    AC_CACHE_CHECK([whether your system supports extended signal handlers],

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines