Index: tools/llvm-config/Makefile
===================================================================
RCS file: /var/cvs/llvm/llvm/tools/llvm-config/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- tools/llvm-config/Makefile	12 Dec 2006 00:43:38 -0000	1.19
+++ tools/llvm-config/Makefile	6 Jan 2007 00:55:26 -0000
@@ -21,6 +21,7 @@
 
 # Combine preprocessor flags (except for -I) and CXX flags.
+SUB_CFLAGS = ${CPP.BaseFlags} ${C.Flags}
 SUB_CXXFLAGS = ${CPP.BaseFlags} ${CXX.Flags}
 
 # This is blank for now.  We need to be careful about adding stuff here:
 # LDFLAGS tend not to be portable, and we don't currently require the
@@ -56,6 +57,7 @@
 $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
 	$(Echo) "Building llvm-config script."
+	$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' > temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
 	$(Verb) $(SED) -f temp.sed < $< > $@
Index: tools/llvm-config/llvm-config.in.in
===================================================================
RCS file: /var/cvs/llvm/llvm/tools/llvm-config/llvm-config.in.in,v
retrieving revision 1.23
diff -u -r1.23 llvm-config.in.in
--- tools/llvm-config/llvm-config.in.in	4 Sep 2006 05:35:23 -0000	1.23
+++ tools/llvm-config/llvm-config.in.in	6 Jan 2007 00:55:27 -0000
@@ -46,6 +46,7 @@
 
 #---- begin Makefile values ----
+my $CFLAGS              = q{@LLVM_CFLAGS@};
 my $CXXFLAGS            = q{@LLVM_CXXFLAGS@};
 my $LDFLAGS             = q{@LLVM_LDFLAGS@};
 my $SYSTEM_LIBS         = q{@LIBS@};
 my $LLVM_BUILDMODE      = q{@LLVM_BUILDMODE@};
@@ -107,6 +108,8 @@
             $has_opt = 1; print "$INCLUDEDIR\n";
         } elsif ($arg eq "--libdir") {
             $has_opt = 1; print "$LIBDIR\n";
+        } elsif ($arg eq "--cflags") {
+            $has_opt = 1; print "-I$INCLUDEDIR $CFLAGS\n";
         } elsif ($arg eq "--cxxflags") {
             $has_opt = 1; print "-I$INCLUDEDIR $CXXFLAGS\n";
         } elsif ($arg eq "--ldflags") {
@@ -178,6 +181,7 @@
   --bindir               Directory containing LLVM executables.
   --includedir           Directory containing LLVM headers.
   --libdir               Directory containing LLVM libraries.
+  --cflags               C compiler flags for files that include LLVM headers.
   --cxxflags             C++ compiler flags for files that include LLVM headers.
   --ldflags              Print Linker flags.
   --libs                 Libraries needed to link against LLVM components.