--- vacall/Makefile.in.orig	2013-02-26 09:42:59.000000000 +0100
+++ vacall/Makefile.in	2013-02-26 09:50:06.000000000 +0100
@@ -25,7 +25,7 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 INCLUDES = -I. -I$(srcdir)
-ASPFLAGS = `if test @AS_UNDERSCORE@ = true; then echo '-DASM_UNDERSCORE'; fi`
+ASPFLAGS = `if test @AS_UNDERSCORE@ = true; then echo '-DASM_UNDERSCORE'; fi` $(CPPFLAGS)
 AR = ar
 AR_FLAGS = rc
 RANLIB = @RANLIB@
@@ -52,64 +52,64 @@
 	$(LN) vacall-$(CPU).o vacall.o
 
 vacall-i386.o : vacall-i386.s
-	$(CC) @GCC_X_NONE@ -c vacall-i386.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-i386.s
 
 vacall-i386.s : $(srcdir)/vacall-i386-macro.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-i386-macro.S | grep -v '^ *#line' | grep -v '^#ident' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,% ,%,g' -e 's,\. ,.,g' > vacall-i386.s
 
 vacall-sparc.o : vacall-sparc.s
-	$(CC) @GCC_X_NONE@ -c vacall-sparc.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-sparc.s
 
 vacall-sparc.s : $(srcdir)/vacall-sparc.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-sparc.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' -e 's,\$$,#,g' > vacall-sparc.s
 
 vacall-sparc64.o : vacall-sparc64.s
-	$(CC) @GCC_X_NONE@ -c vacall-sparc64.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-sparc64.s
 
 vacall-sparc64.s : $(srcdir)/vacall-sparc64.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-sparc64.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' -e 's,\$$,#,g' > vacall-sparc64.s
 
 vacall-m68k.o : vacall-m68k.s
-	$(CC) @GCC_X_NONE@ -c vacall-m68k.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-m68k.s
 
 vacall-m68k.s : $(srcdir)/vacall-m68k.mit.S $(srcdir)/vacall-m68k.mot.s
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-m68k.mit.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' | if test @AS_UNDERSCORE@ = true; then sed -e 's/\$$//g'; else sed -e 's/\$$/%/g'; fi > vacall-m68k.s
 
 vacall-mips.o : vacall-mips.s
-	$(CC) @GCC_X_NONE@ -c vacall-mips.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-mips.s
 
 vacall-mips.s : $(srcdir)/vacall-mips.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-mips.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' > vacall-mips.s
 
 vacall-mipsn32.o : vacall-mipsn32.s
-	$(CC) @GCC_X_NONE@ -c vacall-mipsn32.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-mipsn32.s
 
 vacall-mipsn32.s : $(srcdir)/vacall-mipsn32.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-mipsn32.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' > vacall-mipsn32.s
 
 vacall-mips64.o : vacall-mips64.s
-	$(CC) @GCC_X_NONE@ -c vacall-mips64.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-mips64.s
 
 vacall-mips64.s : $(srcdir)/vacall-mips64.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-mips64.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' > vacall-mips64.s
 
 vacall-alpha.o : $(srcdir)/vacall-alpha.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-alpha.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-alpha.s
 
 vacall-hppa.o : $(srcdir)/vacall-hppa.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-hppa.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-hppa.s
 
 vacall-s390.o : $(srcdir)/vacall-s390.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-s390.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-s390.s
 
 vacall-arm.o : vacall-arm.s
-	$(CC) @GCC_X_NONE@ -c vacall-arm.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-arm.s
 
 vacall-arm.s : $(srcdir)/vacall-arm.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-arm.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//,@,g' -e 's,\$$,#,g' > vacall-arm.s
 
 vacall-armel.o : $(srcdir)/vacall-armel.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-armel.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-armel.s
 
 vacall-powerpc.o : $(srcdir)/vacall-powerpc-aix.old.s $(srcdir)/vacall-powerpc-aix.new.s $(srcdir)/vacall-powerpc-sysv4.s $(srcdir)/vacall-powerpc-linux.s $(srcdir)/vacall-powerpc-macos.s
 	case "$(OS)" in \
@@ -119,23 +119,23 @@
 	  macos* | darwin*) syntax=macos;; \
 	  *) syntax=sysv4;; \
 	esac; \
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-powerpc-$${syntax}.s ; \
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-powerpc-$${syntax}.s ; \
 	mv vacall-powerpc-$${syntax}.o vacall-powerpc.o
 
 vacall-powerpc64.o : $(srcdir)/vacall-powerpc64.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-powerpc64.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-powerpc64.s
 
 vacall-m88k.o : $(srcdir)/vacall-m88k.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
 
 vacall-convex.o : $(srcdir)/vacall-convex.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-convex.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-convex.s
 
 vacall-ia64.o : $(srcdir)/vacall-ia64.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-ia64.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-ia64.s
 
 vacall-x86_64.o : $(srcdir)/vacall-x86_64.s
-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-x86_64.s
+	$(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/vacall-x86_64.s
 
 misc.o : $(srcdir)/misc.c vacall.h config.h
 	$(CC) $(CFLAGS) $(INCLUDES) -c $(srcdir)/misc.c