--- gforth/configure.in	2003/08/06 09:35:49	1.126
+++ gforth/configure.in	2003/08/23 20:16:08	1.129
@@ -21,12 +21,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.1],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.6.1-20030806],[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="March 11, 2003"
+UPDATED="August 6, 2003"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
@@ -97,6 +97,16 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor
 AC_SUBST(CC)
 AC_SUBST(DEBUGFLAG)
 
+AC_MSG_CHECKING(make type)
+make_type=`make -v 2>&1|grep 'ake version'|sed 's/ version .*//'`
+
+GNUMAKE='#'
+test "$make_type" = "GNU Make" && GNUMAKE=''
+
+AC_MSG_RESULT($make_type)
+
+AC_SUBST(GNUMAKE)
+
 dnl gcc-3.2 seems to work fine now
 dnl AC_MSG_CHECKING(gcc version)
 dnl gcc_version=`$CC -v 2>&1|grep 'gcc version'|sed 's/.*gcc version //'`
@@ -324,19 +334,25 @@ AC_PATH_PROG(INSTALL_INFO,install-info,[
 case "$host_os" in
 	*win32|cygwin)
 		DIRSEP="\\\\"
+		PATHSEP=";"
 		;;
 	*darwin*)
 		#Darwin uses some funny preprocessor by default; eliminate it:
-		AC_MSG_NOTICE([using -traditional-cpp on Darwin])
+		AC_MSG_NOTICE([using -no-cpp-precomp on Darwin])
 		CFLAGS="$CFLAGS -no-cpp-precomp"
 		DIRSEP="/"
+		PATHSEP=":"
 		;;
 	*)
 		DIRSEP="/"
+		PATHSEP=":"
 		;;
 esac
 AC_SUBST(DIRSEP)
 AC_DEFINE_UNQUOTED(DIRSEP,'$DIRSEP',[a directory separator character])
+AC_SUBST(PATHSEP)
+AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character])
+
 
 dnl Now a little support for DOS/DJGCC
 AC_SUBST(GFORTH_EXE)
@@ -348,10 +364,6 @@ GFORTHITC_EXE=""
 AC_SUBST(GFORTHDITC_EXE)
 GFORTHDITC_EXE=""
 
-PATHSEP=":"
-AC_SUBST(PATHSEP)
-AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character])
-
 AC_SUBST(FORTHSIZES)
 
 dnl if test "$PEEPHOLE" = "yes"
@@ -438,8 +450,11 @@ AC_CHECK_LIB(callback,__vacall_r)
 AC_CHECK_LIB(vacall,vacall)
 AC_CHECK_LIB(trampoline,alloc_trampoline)
 FFCALLFLAG="false"
-test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries])
+OLDCALLFLAG="true"
+test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && OLDCALLFLAG="false" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries])
+test $ac_cv_lib_avcall___builtin_avcall = no && AC_DEFINE(HAS_OLDCALL,,[define this if you want to use the old call libraries])
 AC_SUBST(FFCALLFLAG)
+AC_SUBST(OLDCALLFLAG)
 if test "$host_os" != "nextstep3"
 then
 	AC_FUNC_MEMCMP