--- gforth/configure.in 2008/01/07 20:54:15 1.206 +++ gforth/configure.in 2008/01/16 22:35:38 1.210 @@ -32,16 +32,6 @@ AC_CONFIG_HEADERS(engine/config.h) #suppress the "-g -O2" default test "$CFLAGS" || CFLAGS=-O2 -AC_ARG_ENABLE(force-reg, - AC_HELP_STRING([--enable-force-reg], - [ Use explicit register declarations if they appear in - the machine.h file. This can cause a good speedup, - but also incorrect code with some gcc versions on - some processors (default disabled).]), - ,enable_force_reg=no) -test "$enable_force_reg" = "no"|| - AC_DEFINE(FORCE_REG,,[Define if you want to use explicit register declarations for better performance or for more convenient CODE words (does not work with all GCC versions on all machines)]) - AC_ARG_ENABLE(force-cdiv, AC_HELP_STRING([--enable-force-cdiv], [ Use the native C division - symmetric - instead of @@ -518,6 +508,10 @@ else OPTS=-noll fi fi + +if grep -q FORCE_REG arch/$machine/machine.h; then + OPTS=`for i in $OPTS; do echo -n "$i-reg "; done`$OPTS +fi AC_SUBST(OPTS) AC_TYPE_OFF_T @@ -606,7 +600,7 @@ AC_MSG_RESULT($M4) # Find installed Gforth AC_MSG_CHECKING([for gforth]) GFORTH="`which gforth 2>/dev/null`" -if test ! -z "$GFORTH"; then GFORTH="$GFORTH -m4M" ; fi +if test ! -z "$GFORTH"; then GFORTH="$GFORTH -m4M --die-on-signal -i `gforth --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`" ; fi AC_SUBST(GFORTH) AC_DEFINE_UNQUOTED(GFORTH,"$GFORTH",[How to invoke gforth]) AC_MSG_RESULT($GFORTH) @@ -662,13 +656,13 @@ AC_CHECK_PROG([MASSAGE_EXE],[chcon],[chc dnl Now a little support for DOS/DJGCC AC_SUBST(GFORTH_EXE) -GFORTH_EXE="" +GFORTH_EXE="true" AC_SUBST(GFORTHFAST_EXE) -GFORTHFAST_EXE="" +GFORTHFAST_EXE="true" AC_SUBST(GFORTHITC_EXE) -GFORTHITC_EXE="" +GFORTHITC_EXE="true" AC_SUBST(GFORTHDITC_EXE) -GFORTHDITC_EXE="" +GFORTHDITC_EXE="true" AC_SUBST(FORTHSIZES)