diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 32be2e27..b8aa82c8 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -866,7 +866,7 @@ AC_CACHE_CHECK([whether vm_protect works], AC_TRY_RUN([ #define CONFIGURE_TEST_VM_MAP #define TEST_VM_PROT_$test_def - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], ac_cv_vm_protect_works=no, rm -f core, dnl When cross-compiling, do not assume anything ac_cv_vm_protect_works="guessing no" @@ -875,7 +875,7 @@ AC_CACHE_CHECK([whether vm_protect works], AC_TRY_RUN([ #define CONFIGURE_TEST_VM_MAP #define TEST_VM_PROT_RDWR_WRITE - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], , ac_cv_vm_protect_works=no, dnl When cross-compiling, do not assume anything ac_cv_vm_protect_works="guessing no" @@ -920,7 +920,7 @@ AC_CACHE_CHECK([whether mmap supports MAP_ANON], #define HAVE_MMAP_ANON #define CONFIGURE_TEST_VM_MAP #define TEST_VM_MMAP_ANON - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], ac_cv_mmap_anon=yes, ac_cv_mmap_anon=no, dnl When cross-compiling, do not assume anything. ac_cv_mmap_anon="guessing no" @@ -939,7 +939,7 @@ AC_CACHE_CHECK([whether mmap supports MAP_ANONYMOUS], #define HAVE_MMAP_ANONYMOUS #define CONFIGURE_TEST_VM_MAP #define TEST_VM_MMAP_ANON - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], ac_cv_mmap_anonymous=yes, ac_cv_mmap_anonymous=no, dnl When cross-compiling, do not assume anything. ac_cv_mmap_anonymous="guessing no" @@ -960,7 +960,7 @@ AC_CACHE_CHECK([whether mprotect works], AC_TRY_RUN([ #define CONFIGURE_TEST_VM_MAP #define TEST_VM_PROT_$test_def - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], ac_cv_mprotect_works=no, rm -f core, dnl When cross-compiling, do not assume anything ac_cv_mprotect_works="guessing no" @@ -969,7 +969,7 @@ AC_CACHE_CHECK([whether mprotect works], AC_TRY_RUN([ #define CONFIGURE_TEST_VM_MAP #define TEST_VM_PROT_RDWR_WRITE - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" ], , ac_cv_mprotect_works=no, dnl When cross-compiling, do not assume anything ac_cv_mprotect_works="guessing no" @@ -1009,7 +1009,7 @@ AC_CACHE_CHECK([whether we can map Low Memory area 0x0000-0x2000], AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_RUN([ - #include "vm_alloc.cpp" + #include "../CrossPlatform/vm_alloc.cpp" int main(void) { /* returns 0 if we could map the lowmem globals */ volatile char * lm = 0; if (vm_init() < 0) exit(1); @@ -1098,8 +1098,8 @@ AC_CACHE_CHECK([whether your system supports Mach exceptions], #define HAVE_MACH_TASK_SELF 1 #define HAVE_MACH_EXCEPTIONS 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], [ sigsegv_recovery=mach ac_cv_have_mach_exceptions=yes @@ -1122,8 +1122,8 @@ AC_CACHE_CHECK([whether your system supports Windows exceptions], AC_TRY_RUN([ #define HAVE_WIN32_EXCEPTIONS 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], [ sigsegv_recovery=win32 ac_cv_have_win32_exceptions=yes @@ -1151,8 +1151,8 @@ if [[ -z "$sigsegv_recovery" ]]; then #define HAVE_ASM_UCONTEXT 1 #define HAVE_SIGINFO_T 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], [ sigsegv_recovery=siginfo ac_cv_have_asm_extended_signals=yes @@ -1181,8 +1181,8 @@ if [[ -z "$sigsegv_recovery" ]]; then #endif #define HAVE_SIGINFO_T 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], [ sigsegv_recovery=siginfo ac_cv_have_extended_signals=yes @@ -1207,8 +1207,8 @@ if [[ -z "$sigsegv_recovery" ]]; then AC_TRY_RUN([ #define HAVE_SIGCONTEXT_SUBTERFUGE 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], [ sigsegv_recovery=sigcontext ac_cv_have_sigcontext_hack=yes @@ -1231,8 +1231,8 @@ AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler], AC_TRY_RUN([ #define HAVE_SIGSEGV_SKIP_INSTRUCTION 1 #define CONFIGURE_TEST_SIGSEGV_RECOVERY - #include "vm_alloc.cpp" - #include "sigsegv.cpp" + #include "../CrossPlatform/vm_alloc.cpp" + #include "../CrossPlatform/sigsegv.cpp" ], ac_cv_have_skip_instruction=yes, ac_cv_have_skip_instruction=no, dnl When cross-compiling, do not assume anything. ac_cv_have_skip_instruction=no