Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
+++ libcfa/src/Makefile.am	(revision 7a7ab420255dadabf1a7c4c246e7a087ca8e23cd)
@@ -28,7 +28,7 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
-AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
+AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
+AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 CFACC = @CFACC@
 
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
+++ libcfa/src/Makefile.in	(revision 7a7ab420255dadabf1a7c4c246e7a087ca8e23cd)
@@ -243,4 +243,6 @@
 CFLAGS = @CFLAGS@
 CONFIGURATION = @CONFIGURATION@
+CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
+CONFIG_CFLAGS = @CONFIG_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -339,7 +341,7 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr
-AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
-AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
+AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
+AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 
 #----------------------------------------------------------------------------------------------------------------