--- gforth/configure.in 2008/10/26 13:28:02 1.259 +++ gforth/configure.in 2008/10/28 22:23:26 1.262 @@ -204,25 +204,24 @@ case "$host_cpu" in if test -z $arm_cacheflush; then case "$host_os" in *linux*) - arm_cacheflush=arch/arm/cacheflush-linux + AC_LIBOBJ(../arch/arm/cacheflush-linux) ;; *) no_dynamic_default=1 - arm_cacheflush=arch/arm/cacheflush0 + AC_LIBOBJ(../arch/arm/cacheflush0) AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation]) ;; esac + else + AC_LIBOBJ(../$arm_cacheflush) + test $srcdir = . || AC_MSG_WARN([setting arm_cacheflush requires building in the source directory]) fi - AC_LIBSOURCES([arch/arm/cacheflush0, dnl - arch/arm/cacheflush-linux]) - AC_LIBOBJ(../$arm_cacheflush) #longer skipcodes lead to problems on ARM, and it uses #only 4-byte alignment anyway test "$skipcode" || skipcode="nop" ;; hppa*) machine=hppa - $srcdir/mkinstalldirs arch/hppa AC_LIBOBJ(../arch/hppa/cache) #-N needed for --dynamic LDFLAGS="$LDFLAGS -Xlinker -N" @@ -302,7 +301,6 @@ case "$host_cpu" in ;; power*|rs6000) machine=power - $srcdir/mkinstalldirs arch/power AC_CHECK_FUNC(_sync_cache_range,[true],[AC_LIBOBJ(../arch/power/_sync_cache_range)]) #long long is broken on (at least) gcc-2.95.* for PPC test x$ac_cv_sizeof_long_long = x && @@ -918,6 +916,9 @@ chmod +x preforth test -d kernel||mkdir kernel if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi $srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION -ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],[[PACKAGE_VERSION=$PACKAGE_VERSION]]) +$srcdir/mkinstalldirs arch/$machine +ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]], +[PACKAGE_VERSION=$PACKAGE_VERSION + machine=$machine]) AC_OUTPUT