some configure.in cleanups. In particular, I replaced all echos with

  AC_MSG_... macros.
The gcc version (for disabling dynamic code) is now checked in configure (not
  when compiling main.c)
updated elisp-comp install-sh missing mkinstalldirs from autoconf-2.54

Author: anton

configure.in

@@ -24,13 +24,16 @@ dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
 AM_INIT_AUTOMAKE(gforth,0.5.9-20020901)
 #snapshots have numbers major.minor.release-YYYYMMDD
-#note that lexicographic ordering bust be heeded.
+#note that lexicographic ordering must be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
 UPDATED="1 September 2002"
 AC_SUBST(UPDATED)
 AM_CONFIG_HEADER(engine/config.h)
 #AM_CYGWIN32
 
+#default setting that may be changed later:
+no_dynamic_default=0
+
 AC_ARG_ENABLE(force-reg,
 [  --enable-force-reg	  Use explicit register declarations if they appear in
 			  the machine.h file. This can cause a good speedup,
@@ -59,21 +62,20 @@ CFLAGS=$CFLAGS
 
 AC_PROG_CC
 
-if test "$GCC" = "yes"
-then
-   echo "Fine, gcc is available"
-else
-   cat <<'EOF'
-Gforth requires GCC-2.0 or higher (it uses GNU C extensions).
-It does not work with other C compilers. Please install the GNU C compiler,
-and try again (or search for a binary distribution for your platform).
-EOF
-   exit 1
-fi
+test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher)
 
 AC_SUBST(CC)
 AC_SUBST(DEBUGFLAG)
 
+AC_MSG_CHECKING(gcc version)
+gcc_version=`$CC -v 2>&1|grep 'gcc version'|sed 's/.*gcc version //'`
+AC_MSG_RESULT($gcc_version)
+if expr "$gcc_version" \> 3.0.4 >/dev/null && expr "$gcc_version" \< 3.2.1 >/dev/null
+then
+    no_dynamic_default=1
+    AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
+fi
+
 dnl the following macro produces a warning with autoconf-2.1
 AC_CHECK_SIZEOF(char *)
 case "$ac_cv_sizeof_char_p" in
@@ -94,6 +96,7 @@ AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 
+AC_MSG_CHECKING([for a C type for cells])
 ac_cv_int_type_cell=none
 case "$ac_cv_sizeof_char_p" in
   $ac_cv_sizeof_int)
@@ -112,13 +115,10 @@ case "$ac_cv_sizeof_char_p" in
     ac_cv_int_type_cell="long long"
     ;;
 esac
-if test "$ac_cv_int_type_cell" != int; then
-	echo "So, sizeof(pointer)!=sizeof(int); looks like a DOS C compiler to me."
-	echo "Since you don't have a proper C on this machine, that's one more reason"
-	echo "to use Forth;-)"
-fi
+AC_MSG_RESULT($ac_cv_int_type_cell)
 AC_DEFINE_UNQUOTED(CELL_TYPE,$ac_cv_int_type_cell,[an integer type that is as long as a pointer])
 
+AC_MSG_CHECKING([for a C type for double-cells])
 ac_cv_int_type_double_cell=none
 case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
   $ac_cv_sizeof_short)
@@ -134,15 +134,13 @@ case `expr 2 '*' "$ac_cv_sizeof_char_p"` in
     ac_cv_int_type_double_cell="long long"
     ;;
 esac
+AC_MSG_RESULT($ac_cv_int_type_double_cell)
 if test "$ac_cv_int_type_double_cell" = none; then
-	echo "Emulating double-cell arithmetic. This may be slow."
-	echo "If you find this unacceptable, ask the GCC maintainers to provide proper"
-	echo 'long longs for your machine (the GCC manual states that they \"are twice as'
-	echo "long as \`long int\'\")."
+	AC_MSG_WARN([Emulating double-cell arithmetic. This may be slow.])
 	AC_LIBOBJ(dblsub)
 	AC_DEFINE(BUGGY_LONG_LONG,,[define this if there is no working DOUBLE_CELL_TYPE on your machine])
 else
-  AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
+	AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer])
 fi
 
 AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
@@ -196,16 +194,28 @@ case "$host_cpu" in
 		;;
 	mips*)
 		machine=mips
+		#dynamic native code has the following problems on MIPS:
+		#
+		#1) J/JAL seems relocatable, but is are only
+		#relocatable within a 256MB-segment.  While we try to
+		#get the linker to arrange this, there is no guarantee
+		#that this will succeed (and if the user uses a lot of
+		#memory, it is likely to fail).
+		#
+		#2) The way we generate dynamic native code may
+		#violate MIPS architectural restrictions (in
+		#particular, the delay slots of LW, MFLO, etc.)
+		#
+		#Therefore we disable dynamic native code by default:
+		no_dynamic_default=1
+		AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
 		#link text and data segment into the same 256M region!
 		AC_MSG_CHECKING([whether the linker accepts -T])
 		OLDLDFLAGS=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Xlinker -T -Xlinker 10000000"
 		AC_TRY_LINK(,,ac_link_mips_t=yes,ac_link_mips_t=no)
 		test $ac_link_mips_t = yes||LDFLAGS=$OLDLDFLAGS
 		AC_MSG_RESULT($ac_link_mips_t)
-		fixme #dynamically generated code should be in the same 256MB
-		# region as the text segment; no indirect threading necessary
-		test $ac_link_mips_t = yes||(echo cannot link text and data into same 256M region, using indirect threading; AC_DEFINE(INDIRECT_THREADED,,[Define if you want to force an indirect threaded code implementation]))
 		AC_MSG_CHECKING([whether the linker accepts -D])
 		OLDLDFLAGS=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Xlinker -D -Xlinker 10400000"
@@ -224,10 +234,9 @@ case "$host_cpu" in
 		AC_CHECK_FUNC(_sync_cache_range,true,AC_LIBOBJ(../arch/power/_sync_cache_range))
 		;;
 	*)
-		echo "Using a generic machine description."
-		echo "I'll assume that C floats and doubles are represented by IEEE single and"
-		echo "double numbers. If this is not so, SF@ etc. will not work correctly."
-		echo "FLUSH-ICACHE will do nothing, so END-CODE may not work properly!"
+		AC_MSG_WARN([Using a generic machine description])
+		AC_MSG_WARN([Assuming C floats and doubles are IEEE floats and doubles (for SF@ DF@ SF! DF!)])
+		AC_MSG_WARN([FLUSH-ICACHE will do nothing, so END-CODE may not work properly!])
 		machine=generic
 esac
 AC_SUBST(host)
@@ -308,9 +317,10 @@ else
 fi
 
 #check how to do asm(".skip 16")
+AC_MSG_CHECKING([if and how we can waste code space])
+skipcode=no
 for i in ".skip 16" ".block 16" ".org .+16" ".=.+16" ".space 16"
 do
-	AC_MSG_CHECKING([whether asm("$i") skips 16 bytes])
 	AC_TRY_RUN(
 int foo(int);
 main()
@@ -326,13 +336,20 @@ int foo(int x)
   }
   return (&&label2)-(&&label1);
 }
-	,AC_MSG_RESULT(yes)
-         AC_DEFINE_UNQUOTED(SKIP16,asm("$i"),statement for skipping 16 bytes)
-         break
-	,AC_MSG_RESULT(no),)
-	
+	,skipcode=$i; break
+	,,)
 done	
+AC_MSG_RESULT($skipcode)
+if test "$skipcode" = no
+then 
+    no_dynamic_default=1
+    AC_DEFINE_UNQUOTED(SKIP16,((void)0),statement for skipping 16 bytes)
+    AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2))
+else
+    AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes)
+fi
 
+AC_DEFINE_UNQUOTED(NO_DYNAMIC_DEFAULT,$no_dynamic_default,default value for no_dynamic)
 
 dnl Checks for programs.
 AC_PROG_LN_S
@@ -350,7 +367,7 @@ fi
 AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh)
 AC_CHECK_FUNCS(dlopen sys_siglist getrusage)
 AC_DECL_SYS_SIGLIST
-AC_CHECK_FUNC(getopt_long,true,AC_LIBOBJ(getopt.$ac_objext getopt1))
+AC_CHECK_FUNC(getopt_long,true,AC_LIBOBJ(getopt); AC_LIBOBJ(getopt1))
 AC_CHECK_FUNCS(expm1 log1p)
 AC_REPLACE_FUNCS(rint ecvt)
 dnl No check for select, because our replacement is no good under

elisp-comp

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright 1995 Free Software Foundation, Inc.
 # François Pinard <[email protected]>, 1995.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 # This script byte-compiles all `.el' files which are part of its
 # arguments, using GNU Emacs, and put the resulting `.elc' files into
 # the current directory, so disregarding the original directories used
@@ -41,7 +46,7 @@ else
    cd $tempdir
 
    echo "(setq load-path (cons nil load-path))" > script
-   $EMACS -q -batch -l script -f batch-byte-compile *.el
+   $EMACS -batch -q -l script -f batch-byte-compile *.el
    mv *.elc ..
 
    cd ..

engine/main.c

@@ -128,13 +128,8 @@ Cell last_jump=0; /* if the last prim was compiled without jump, this
                      is it's number, otherwise this contains 0 */
 
 static int no_super=0;   /* true if compile_prim should not fuse prims */
-/* --no-dynamic by default on gcc versions >=3.1 (it works with 3.0.4,
-   but not with 3.2) */
-#if (__GNUC__>2 && __GNUC_MINOR__>=1)
-static int no_dynamic=1; /* true if compile_prim should not generate code */
-#else
-static int no_dynamic=0; /* true if compile_prim should not generate code */
-#endif
+static int no_dynamic=NO_DYNAMIC_DEFAULT; /* if true, no code is generated
+					     dynamically */
 
 #ifdef HAS_DEBUG
 int debug=0;

install-sh

@@ -1,15 +1,27 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
-#
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
 
 
 # set DOITPROG to echo to test this script
@@ -29,7 +41,7 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-tranformbasename=""
+transformbasename=""
 transform_arg=""
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
@@ -97,7 +109,7 @@ then
 	echo "install:	no input file specified"
 	exit 1
 else
-	true
+	:
 fi
 
 if [ x"$dir_arg" != x ]; then
@@ -106,18 +118,19 @@ if [ x"$dir_arg" != x ]; then
 
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
-		instcmd=mkdir
+		instcmd=$mkdirprog
 	fi
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f $src -o -d $src ]
+	if [ -f "$src" ] || [ -d "$src" ]
 	then
-		true
+		:
 	else
 		echo "install:  $src does not exist"
 		exit 1
@@ -128,7 +141,7 @@ else
 		echo "install:	no destination specified"
 		exit 1
 	else
-		true
+		:
 	fi
 
 # If destination is a directory, append the input filename; if your system
@@ -138,7 +151,7 @@ else
 	then
 		dst="$dst"/`basename $src`
 	else
-		true
+		:
 	fi
 fi
 
@@ -150,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
+defaultIFS='
+	'
 IFS="${IFS-${defaultIFS}}"
 
 oIFS="${IFS}"
@@ -170,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
 		$mkdirprog "${pathcomp}"
 	else
-		true
+		:
 	fi
 
 	pathcomp="${pathcomp}/"
@@ -181,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd $dst &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
@@ -203,7 +216,7 @@ else
 	then
 		dstfile=`basename $dst`
 	else
-		true
+		:
 	fi
 
 # Make a temp file name in the proper directory.
@@ -222,10 +235,10 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
 
 # Now rename the file to the real destination.