Fix Mac fontconfig build

gyp/common_variables.gypi

Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 74e596cf193127be5dc6f73db59bcc3017cd0049..c915e1d2641728d1c568bde07e25efffa85c1ee7 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -96,6 +96,7 @@
       'skia_shared_lib%': 0,
       'skia_opencl%': 0,
       'skia_distancefield_fonts%': 0,
+      'skia_mac_poppler%': 1,

[bungeman-skia, 2014/01/07 21:13:29]

It looks like the actual meaning of this variable is whether the gm tool (or any
tool) should depend on poppler or not. Maybe something like skia_poppler_enabled
and the logic. Come to think of it, what is really wanted here is a
skia_init_fontconfig to control if fontconfig should be set up or not. (This
would directly control the new dependencies added in gyp/fontconfig.gyp.)

[vandebo (ex-Chrome), 2014/01/08 21:24:15]

We don't want to have poppler without fontconfig installed/initialized - you'll
get spew from poppler and bad output.  But your other points are right, changed
to skia_poppler_enabled and made it not mac specific.

 
       # These variables determine the default optimization level for different
       # compilers.
@@ -157,6 +158,7 @@
     'skia_shared_lib%': '<(skia_shared_lib)',
     'skia_opencl%': '<(skia_opencl)',
     'skia_distancefield_fonts%': '<(skia_distancefield_fonts)',
+    'skia_mac_poppler%': '<(skia_mac_poppler)',
     'skia_static_initializers%': '<(skia_static_initializers)',
     'ios_sdk_version%': '6.0',
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',