make/lib/Awt2dLibraries.gmk

rev 13458 : 8170681: Remove fontconfig header files from JDK source tree
Reviewed-by: serb, erikj

@@ -526,10 +526,11 @@
         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
 
     LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+        $(FONTCONFIG_CFLAGS) \
         $(CUPS_CFLAGS) \
         $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \

@@ -770,10 +771,11 @@
     endif
 
     LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
         $(CUPS_CFLAGS) \
+        $(FONTCONFIG_CFLAGS) \
         $(X_CFLAGS) \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \