diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 1abf218a71be..0385fa4bd490 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ +export ENABLE_HEADLESS=@ENABLE_HEADLESS@ export ENABLE_KAB=@ENABLE_KAB@ export ENABLE_KDE4=@ENABLE_KDE4@ export ENABLE_KDE=@ENABLE_KDE@ diff --git a/configure.in b/configure.in index 39fe207ddea5..0d320e71a95f 100644 --- a/configure.in +++ b/configure.in @@ -8108,8 +8108,6 @@ if test "x$enable_headless" = "xyes"; then ENABLE_HEADLESS="TRUE" SCPDEFS="$SCPDEFS -DHEADLESS" R="headless" - # this does not work see hack in Library_vcl.mk - AC_DEFINE(HEADLESS) fi AC_SUBST(ENABLE_HEADLESS) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index b544f749bced..26eecbcb1f62 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) gb_GLOBALDEFS += -DENABLE_GRAPHITE endif +ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) +gb_GLOBALDEFS += -DHEADLESS +endif + ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3420f7d847ad..843dcebb5e0a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\ $$(FREETYPE_CFLAGS) \ )) $(eval $(call gb_Library_add_defs,vcl,\ - -DHEADLESS \ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ |