-DENABLE_GRAPHITE -> config_graphite.h

Change-Id: I94c7865b68c65540765c9fbfba6f669055dad4ba

17 files changed, 24 insertions, 8 deletions

diff --git a/config/.gitignore b/config/.gitignore
index 325a7fd030e4..9becb5b61647 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1,3 +1 @@
-config_global.h
-config_vclplug.h
-config_telepathy.h
+config_*.h
diff --git a/config/config_graphite.h.in b/config/config_graphite.h.in
new file mode 100644
index 000000000000..eb7a7b3400f7
--- /dev/null
+++ b/config/config_graphite.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_GRAPHITE_H
+#define CONFIG_GRAPHITE_H
+
+#undef ENABLE_GRAPHITE
+
+#endif
diff --git a/configure.ac b/configure.ac
index eb0334c4c1fa..819ea6da52ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8462,6 +8462,7 @@ AC_MSG_CHECKING([whether to enable graphite support])
 if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
     AC_MSG_RESULT([yes])
     ENABLE_GRAPHITE="TRUE"
+    AC_DEFINE(ENABLE_GRAPHITE)
     AC_MSG_CHECKING([which graphite to use])
     if test "$with_system_graphite" = "yes"; then
         AC_MSG_RESULT([external])
@@ -12423,6 +12424,7 @@ fi
 
 AC_CONFIG_FILES([config_host.mk Makefile])
 AC_CONFIG_HEADERS([config/config_global.h])
+AC_CONFIG_HEADERS([config/config_graphite.h])
 AC_CONFIG_HEADERS([config/config_telepathy.h])
 AC_CONFIG_HEADERS([config/config_vclplug.h])
 AC_OUTPUT
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1970d54f6017..edb95c5b2f7f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -267,7 +267,6 @@ gb_GLOBALDEFS += \
 		DISABLE_EXPORT \
 		DISABLE_EXTENSIONS \
 		DISABLE_SCRIPTING \
-		ENABLE_GRAPHITE \
 	)
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 4b476211bfa0..cbdcc57aadc9 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -56,6 +56,8 @@
 
 #include <vector>
 
+#include <config_graphite.h>
+
 #if OSL_DEBUG_LEVEL > 1
 #include <ndtxt.hxx>        // pSwpHints, output operator
 #endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3550beb6c9bb..64808890c37c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -293,10 +293,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 
 ## handle Graphite
 ifeq ($(ENABLE_GRAPHITE),TRUE)
-# add defines, graphite sources for all platforms
-$(eval $(call gb_Library_add_defs,vcl,\
-    -DENABLE_GRAPHITE \
-))
+# add graphite sources for all platforms
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_features \
     vcl/source/glyphs/graphite_layout \
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 31aec5599511..fa256aa96f46 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -28,6 +28,7 @@
 #include "vcl/svapp.hxx"
 #include <outfont.hxx>
 #include <impfont.hxx>
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #include <graphite_layout.hxx>
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index edd35320e7bd..9d677e1cf252 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -24,6 +24,7 @@
 
 #include <rtl/textcvt.h>
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 class GraphiteFaceWrapper;
 #endif
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index bc3c544ad896..deef6be55659 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -27,6 +27,7 @@
 #include <vcl/bitmap.hxx>
 #include <outfont.hxx>
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite_features.hxx>
 #endif
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 3365fbb569e0..27db385ebf09 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -46,6 +46,7 @@
 #include "region.h"
 #include "langboost.hxx"
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite_layout.hxx>
 #include <graphite_serverfont.hxx>
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 655f2cdfbfa9..9de49e7543fd 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -48,6 +48,7 @@ class RawBitmap;
 class ServerFontLayout;
 #include <sallayout.hxx>
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 class GraphiteFaceWrapper;
 #endif
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 7a2b804b6cb3..92c0b8e0db43 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -29,6 +29,7 @@
 #include "boost/scoped_ptr.hpp"
 #include <boost/unordered_set.hpp>
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #endif
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index acd50e21d762..c76945868f50 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -63,6 +63,7 @@
 
 #include "osl/file.h"
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include "graphite_features.hxx"
 #endif
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 116c6a9d132c..48f295b5931b 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -49,6 +49,8 @@
 #include <queue>
 #include <set>
 
+#include <config_graphite.h>
+
 // -=-= SalPolyLine =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #define STATIC_POINTS 64
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index beaf8fd9d68b..fb7027eab594 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -66,6 +66,7 @@
 #include "salframe.hxx"
 #include "outdev.h"
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite_layout.hxx>
 #include <graphite_serverfont.hxx>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 597df76eb59c..da4f4e071564 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -64,6 +64,7 @@
 
 #include <algorithm>
 
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <graphite2/Font.h>
 #endif
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 03e59a0b80e3..fcc5fdcd2578 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -50,6 +50,7 @@
 typedef boost::unordered_map<int,int> IntMap;
 
 // Graphite headers
+#include <config_graphite.h>
 #ifdef ENABLE_GRAPHITE
 #include <i18npool/languagetag.hxx>
 #include <graphite_layout.hxx>