--- gforth/configure.in	2007/06/30 17:52:22	1.193
+++ gforth/configure.in	2007/07/03 21:41:29	1.195
@@ -591,7 +591,7 @@ AC_MSG_RESULT($ac_noreorder_blocks)
 AC_MSG_CHECKING([if $CC understands -falign-labels=1])
 CFLAGS_1="$CFLAGS"
 CFLAGS="$CFLAGS -falign-labels=1"
-AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-labels=1",ac_align_labels=no)
+AC_TRY_COMPILE(,,ac_align_labels=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-labels=1",ac_align_labels=no)
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_align_labels)
 
@@ -599,7 +599,7 @@ AC_MSG_RESULT($ac_align_labels)
 AC_MSG_CHECKING([if $CC understands -falign-loops=1])
 CFLAGS_1="$CFLAGS"
 CFLAGS="$CFLAGS -falign-loops=1"
-AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-loops=1",ac_align_loops=no)
+AC_TRY_COMPILE(,,ac_align_loops=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-loops=1",ac_align_loops=no)
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_align_loops)
 
@@ -607,7 +607,7 @@ AC_MSG_RESULT($ac_align_loops)
 AC_MSG_CHECKING([if $CC understands -falign-jumps=1])
 CFLAGS_1="$CFLAGS"
 CFLAGS="$CFLAGS -falign-jumps=1"
-AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-jumps=1",ac_align_jumps=no)
+AC_TRY_COMPILE(,,ac_align_jumps=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-jumps=1",ac_align_jumps=no)
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_align_jumps)
 
@@ -617,6 +617,17 @@ AC_TRY_COMPILE(,[int __attribute__((unus
 AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_UNUSED,[attribute for possibly unused variables])
 AC_MSG_RESULT($MAYBE_UNUSED)
 
+#try if m4 understands -s
+AC_MSG_CHECKING([how to invoke m4])
+if m4 -s /dev/null; then
+ M4="m4 -s"
+else
+ M4=m4
+fi
+AC_SUBST(M4)
+AC_DEFINE_UNQUOTED(M4,"$M4",[How to invoke m4])
+AC_MSG_RESULT($M4)
+
 echo "machine='$machine'"
 
 dnl AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine)