Kaydet (Commit) f8a120b0 authored tarafından Riccardo Magliocchetti's avatar Riccardo Magliocchetti Kaydeden (comit) Matúš Kukan

headless: cleanup HEADLESS definition

Define HEADLESS globally as it is meant to be.
üst 3c177b96
...@@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ ...@@ -102,6 +102,7 @@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK3=@ENABLE_GTK3@
export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK=@ENABLE_GTK@
export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
export ENABLE_HEADLESS=@ENABLE_HEADLESS@
export ENABLE_KAB=@ENABLE_KAB@ export ENABLE_KAB=@ENABLE_KAB@
export ENABLE_KDE4=@ENABLE_KDE4@ export ENABLE_KDE4=@ENABLE_KDE4@
export ENABLE_KDE=@ENABLE_KDE@ export ENABLE_KDE=@ENABLE_KDE@
......
...@@ -8108,8 +8108,6 @@ if test "x$enable_headless" = "xyes"; then ...@@ -8108,8 +8108,6 @@ if test "x$enable_headless" = "xyes"; then
ENABLE_HEADLESS="TRUE" ENABLE_HEADLESS="TRUE"
SCPDEFS="$SCPDEFS -DHEADLESS" SCPDEFS="$SCPDEFS -DHEADLESS"
R="headless" R="headless"
# this does not work see hack in Library_vcl.mk
AC_DEFINE(HEADLESS)
fi fi
AC_SUBST(ENABLE_HEADLESS) AC_SUBST(ENABLE_HEADLESS)
......
...@@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) ...@@ -237,6 +237,10 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
gb_GLOBALDEFS += -DENABLE_GRAPHITE gb_GLOBALDEFS += -DENABLE_GRAPHITE
endif endif
ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
gb_GLOBALDEFS += -DHEADLESS
endif
ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
endif endif
......
...@@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\ ...@@ -456,7 +456,6 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
$$(FREETYPE_CFLAGS) \ $$(FREETYPE_CFLAGS) \
)) ))
$(eval $(call gb_Library_add_defs,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\
-DHEADLESS \
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment