--- gforth/Makefile.in	2007/06/17 19:26:42	1.352
+++ gforth/Makefile.in	2007/07/03 21:41:29	1.356
@@ -65,6 +65,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
+M4      = @M4@
 GCC	= @CC@
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
@@ -236,6 +237,7 @@ GFORTH_FI_SRC = \
 	source.fs \
 	startup.fs \
 	struct.fs \
+	struct0x.fs \
 	stuff.fs \
 	tasker.fs \
 	termsize.fs \
@@ -746,11 +748,11 @@ gforth.fi:	$(kernel_fi) gforthmi gforth$
 # -------------	Make c-engine
 
 prim.b:		prim cache0.vmg
-		m4 -s $(srcdir)/prim >$@
+		$(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
-prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg
-		m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@
+prim-fast.b:	prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in
+		$(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@
 		sleep 1 #should make hpux-workaround unnecessary
 
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs