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

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.11 by gbeauche, 2004-11-25T19:14:15Z vs.
Revision 1.15 by gbeauche, 2005-01-19T20:26:01Z

# Line 31 | Line 31 | AC_ARG_ENABLE(addressing,
31    [case "$enableval" in
32     real)        WANT_ADDRESSING_MODE="real";;
33     direct)      WANT_ADDRESSING_MODE="direct";;
34 <   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\)/s//\1/p'`;;
34 >   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;;
35     esac],
36    [WANT_ADDRESSING_MODE="real"]
37   )
# Line 146 | Line 146 | if [[ "x$WANT_SDL" = "xyes" ]]; then
146      LIBS="$LIBS $sdl_libs"
147    else
148      WANT_SDL=no
149 +    WANT_SDL_VIDEO=no
150 +    WANT_SDL_AUDIO=no
151    fi
152    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
153   else
# Line 153 | Line 155 | else
155   fi
156  
157   dnl We need X11, if not using SDL.
158 < if [[ "x$WANT_SDL" = "xno" ]]; then
158 > if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
159    AC_PATH_XTRA
160    if [[ "x$no_x" = "xyes" ]]; then
161      AC_MSG_ERROR([You need X11 to run SheepShaver.])
# Line 303 | Line 305 | AC_CHECK_FUNCS(sigaction signal)
305   AC_CHECK_FUNCS(mmap mprotect munmap)
306   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
307   AC_CHECK_FUNCS(posix_memalign memalign valloc)
308 + AC_CHECK_FUNCS(exp2f log2f exp2 log2)
309  
310   dnl Darwin seems to define mach_task_self() instead of task_self().
311   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 918 | Line 921 | int main(void)
921                  memset(m, 0, ranges[[i]].size);
922                  vm_release(m, ranges[[i]].size);
923                  if (i == n_ranges - 1) {
924 <                        printf("0x%08x\n", ofs);
924 >                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
925 >                                printf("0x%lxul\n", ofs);
926 >                        else
927 >                                printf("0x%08x\n", ofs);
928                          return 0;
929                  }
930          }
# Line 1106 | Line 1112 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1112      ac_cv_have_static_data_exec=no
1113      )
1114    ])
1115 + else
1116 +  ac_cv_use_dyngen=no
1117   fi
1118   AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1119    [Define if your system marks static data pages as executable.])
# Line 1115 | Line 1123 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1123   fi
1124  
1125   dnl Generate Makefile.
1126 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1127   AC_SUBST(DYNGENSRCS)
1128   AC_SUBST(DYNGEN_CC)
1129   AC_SUBST(DYNGEN_OP_FLAGS)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines