--- gforth/Makefile.in	2008/04/05 20:34:13	1.393
+++ gforth/Makefile.in	2008/04/20 15:33:47	1.395
@@ -107,6 +107,7 @@ SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@
 CFLAGS	= $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'
+CPPFLAGS = @CPPFLAGS@
 
 #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@
@@ -849,7 +850,7 @@ gforths: $(ENGINES) $(ENGINES_FAST)
 		$(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
 
 %.so:		%.c
-		$(GCC) -shared $(CFLAGS) $< -o $@
+		$(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 # -------------	Make Documentation
 
@@ -970,7 +971,7 @@ configure: configure.in aclocal.m4
 	cd $(srcdir) && autoconf
 
 aclocal.m4:	configure.in
-		aclocal
+		aclocal -I libltdl/m4
 
 # autoheader might not change config.h.in, so touch a stamp file.
 engine/config.h.in: stamp-h.in
@@ -997,6 +998,6 @@ makefile.os2 engine/makefile.os2: mkos2m
 	sed -f mkos2mf.sed <Makefile.in >makefile.os2
 	sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
 	echo '%.o:	%.c' >>makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2
+	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
 	echo '%.o:	%.c' >>engine/makefile.os2
-	echo '		$$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2
+	echo '		$$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2