diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 43202ca5385a..74ac19004333 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1073,7 +1073,7 @@ endif # ANDROID endif # SYSTEM_REDLAND -ifeq ($(SYSTEM_CAIRO),YES) +ifneq ($(SYSTEM_CAIRO),) define gb_LinkTarget__use_cairo $(call gb_LinkTarget_set_include,$(1),\ @@ -1085,7 +1085,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS)) endef -else ifeq ($(SYSTEM_CAIRO),NO) +else # !SYSTEM_CAIRO define gb_LinkTarget__use_cairo $(call gb_LinkTarget_use_package,$(1),cairo) diff --git a/configure.ac b/configure.ac index c95a723aa1af..90e43ce125d2 100644 --- a/configure.ac +++ b/configure.ac @@ -11809,7 +11809,7 @@ if test "$test_cairo" = "yes"; then : ${with_system_cairo:=$with_system_libs} if test "$with_system_cairo" = "yes"; then - SYSTEM_CAIRO=YES + SYSTEM_CAIRO=TRUE AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 ) @@ -11833,7 +11833,7 @@ if test "$test_cairo" = "yes"; then libo_MINGW_TRY_DLL([libpixman]) libo_MINGW_TRY_DLL([libpng15]) else - SYSTEM_CAIRO=NO + SYSTEM_CAIRO= AC_MSG_RESULT([no]) BUILD_TYPE="$BUILD_TYPE CAIRO" diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 3547593841e8..417dfa280089 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -53,7 +53,7 @@ $(eval $(call gb_StaticLibrary_use_external,plugcon,gtk)) # pick up our cairo libs before they're fully ready, causing problems # (e.g. using our libpixman and system libcairo). Depend on cairo # to delay build until cairo is done. -ifeq ($(SYSTEM_CAIRO),NO) +ifeq ($(SYSTEM_CAIRO),) $(eval $(call gb_StaticLibrary_use_external,plugcon,cairo)) endif endif # ENABLE_GTK=TRUE |