--- SheepShaver/src/Unix/configure.ac	2004/11/24 22:48:02	1.10
+++ SheepShaver/src/Unix/configure.ac	2005/01/10 22:50:54	1.14
@@ -31,7 +31,7 @@ AC_ARG_ENABLE(addressing,
   [case "$enableval" in
    real)        WANT_ADDRESSING_MODE="real";;
    direct)      WANT_ADDRESSING_MODE="direct";;
-   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\)/s//\1/p'`;;
+   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'`;;
    esac],
   [WANT_ADDRESSING_MODE="real"]
 )
@@ -105,6 +105,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
     WANT_MON=no
   fi
 fi
+AC_SUBST(MONSRCS)
 
 dnl Checks for libraries.
 AC_CHECK_LIB(posix4, sem_init)
@@ -302,6 +303,7 @@ AC_CHECK_FUNCS(sigaction signal)
 AC_CHECK_FUNCS(mmap mprotect munmap)
 AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
 AC_CHECK_FUNCS(posix_memalign memalign valloc)
+AC_CHECK_FUNCS(exp2f log2f exp2 log2)
 
 dnl Darwin seems to define mach_task_self() instead of task_self().
 AC_CHECK_FUNCS(mach_task_self task_self)
@@ -445,7 +447,7 @@ if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
   AUDIOSRC="../SDL/audio_sdl.cpp"
 fi
 
-SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
+SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
 
 dnl Define a macro that translates a yesno-variable into a C macro definition
 dnl to be put into the config.h file
@@ -917,7 +919,10 @@ int main(void)
 		memset(m, 0, ranges[[i]].size);
 		vm_release(m, ranges[[i]].size);
 		if (i == n_ranges - 1) {
-			printf("0x%08x\n", ofs);
+			if (sizeof(void *) == 8 && ofs > 0xffffffff)
+				printf("0x%lxul\n", ofs);
+			else
+				printf("0x%08x\n", ofs);
 			return 0;
 		}
 	}
@@ -1105,6 +1110,8 @@ if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
     ac_cv_have_static_data_exec=no
     )
   ])
+else
+  ac_cv_use_dyngen=no
 fi
 AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
   [Define if your system marks static data pages as executable.])
@@ -1114,6 +1121,7 @@ if [[ "x$WANT_JIT" = "xyes" ]]; then
 fi
 
 dnl Generate Makefile.
+AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
 AC_SUBST(DYNGENSRCS)
 AC_SUBST(DYNGEN_CC)
 AC_SUBST(DYNGEN_OP_FLAGS)