Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 8c01e1b356802f8f115089e75d81248e8ac783e8)
+++ libcfa/configure	(revision e3a5a73f76c9a4e3291e13112839d8e420bda8be)
@@ -2977,4 +2977,6 @@
 	;;
 esac
+
+CONFIG_CFAFLAGS="${CONFIG_CFAFLAGS} ${CFAFLAGS}"
 
 
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision 8c01e1b356802f8f115089e75d81248e8ac783e8)
+++ libcfa/configure.ac	(revision e3a5a73f76c9a4e3291e13112839d8e420bda8be)
@@ -64,4 +64,6 @@
 esac
 
+CONFIG_CFAFLAGS="${CONFIG_CFAFLAGS} ${CFAFLAGS}"
+
 AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_CFAFLAGS)
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 8c01e1b356802f8f115089e75d81248e8ac783e8)
+++ libcfa/src/Makefile.am	(revision e3a5a73f76c9a4e3291e13112839d8e420bda8be)
@@ -74,9 +74,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
-	${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 8c01e1b356802f8f115089e75d81248e8ac783e8)
+++ libcfa/src/Makefile.in	(revision e3a5a73f76c9a4e3291e13112839d8e420bda8be)
@@ -926,9 +926,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
-	${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------