--- gforth/configure.in 2008/10/25 22:30:06 1.258 +++ gforth/configure.in 2008/11/01 22:15:32 1.264 @@ -20,12 +20,12 @@ dnl Process this file with autoconf to p dnl We use some automake macros here, dnl but don't use automake for creating Makefile.in -AC_INIT([gforth],[0.6.9-20081006],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.6.9-20081026],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) AC_PREREQ(2.54) #snapshots have numbers major.minor.release-YYYYMMDD #note that lexicographic ordering must be heeded. #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1! -UPDATED="October 10, 2008" +UPDATED="October 26, 2008" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -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,15 +301,18 @@ 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 && ($CC -v 2>&1 |grep 'gcc version 2.95' >/dev/null) && - ac_cv_sizeof_long_long=0 + ac_cv_sizeof_long_long=0 #The only architecture with enough callee-saved registers test x$STACK_CACHE_REGS = x && STACK_CACHE_REGS=3 #or use 2, hardly slower at run-time and starts up faster + + #the skipcode that is normally selected below does not + #work with gcc-3.[34] + test "$skipcode" || skipcode="nop\nnop\nnop\nnop" ;; *) AC_MSG_WARN([Using a generic machine description]) @@ -820,7 +822,7 @@ AC_PROG_INSTALL AC_CHECK_PROGS(TEXI2DVI,texi2dvi4a2ps texi2dvi) dnl MacOS X has a libtool that does something else -AC_CHECK_PROGS(GNU_LIBTOOL,glibtool libtool) +AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool) if test -n "$GNU_LIBTOOL"; then build_libcc_named=build-libcc-named @@ -918,6 +920,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