isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Always build CoglPango support

Browse Source
This commit is contained in:
Jonas Ådahl 2018-05-03 20:51:04 +02:00
parent fba7d8c79c
commit f30cef3046
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/Makefile.am
View File

@ -4,9 +4,7 @@ SUBDIRS += cogl
SUBDIRS += cogl-path
if BUILD_COGL_PANGO
SUBDIRS += cogl-pango
endif
if BUILD_COGL_GLES2
SUBDIRS += cogl-gles2

21
cogl/configure.ac
View File

@ -385,21 +385,8 @@ AM_PATH_GLIB_2_0([glib_req_version],
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES gobject-2.0 gmodule-no-export-2.0"
dnl ============================================================
dnl Should cogl-pango be built?
dnl ============================================================
COGL_PANGO_PKG_REQUIRES="$COGL_PANGO_PKG_REQUIRES pangocairo >= pangocairo_req_version"
AC_ARG_ENABLE(
[cogl-pango],
[AC_HELP_STRING([--enable-cogl-pango=@<:@no/yes@:>@], [Enable pango support @<:@default=yes@:>@])],
[],
enable_cogl_pango=yes
)
AS_IF([test "x$enable_cogl_pango" = "xyes"],
[
COGL_PANGO_PKG_REQUIRES="$COGL_PANGO_PKG_REQUIRES pangocairo >= pangocairo_req_version"
]
)
dnl ============================================================
dnl Choose image loading backend
@ -807,10 +794,7 @@ if test -n "$COGL_PKG_REQUIRES"; then
fi
AC_SUBST(COGL_PANGO_PKG_REQUIRES)
AS_IF([test "x$enable_cogl_pango" = "xyes"],
[PKG_CHECK_MODULES(COGL_PANGO_DEP, [$COGL_PANGO_PKG_REQUIRES])]
)
AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"])
PKG_CHECK_MODULES(COGL_PANGO_DEP, [$COGL_PANGO_PKG_REQUIRES])
dnl ================================================================
dnl Misc program dependencies.
@ -983,7 +967,6 @@ echo " Wayland compositor support: ${enable_wayland_egl_server}"
fi
echo " Build libcogl-gles2 GLES 2.0 frontend api: ${enable_cogl_gles2}"
echo " Image backend: ${COGL_IMAGE_BACKEND}"
echo " Cogl Pango: ${enable_cogl_pango}"
# Compiler/Debug related flags
echo ""