diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-05-03 20:51:04 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-11-06 17:17:36 +0100 |
| commit | f30cef304633b7c56c657a9d985d2fd3dbf462e4 (patch) | |
| tree | ea974dd5e25d00fb881174df074b5dad2a2a8c15 /cogl | |
| parent | fba7d8c79ca77d71367f1187dea61aed17a3d601 (diff) | |
| download | mutter-f30cef304633b7c56c657a9d985d2fd3dbf462e4.tar.gz | |
cogl: Always build CoglPango support
Diffstat (limited to 'cogl')
| -rw-r--r-- | cogl/Makefile.am | 2 | ||||
| -rw-r--r-- | cogl/configure.ac | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/cogl/Makefile.am b/cogl/Makefile.am index f9c97724a..b24abddb7 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -4,9 +4,7 @@ SUBDIRS += cogl SUBDIRS += cogl-path -if BUILD_COGL_PANGO SUBDIRS += cogl-pango -endif if BUILD_COGL_GLES2 SUBDIRS += cogl-gles2 diff --git a/cogl/configure.ac b/cogl/configure.ac index f04f1e356..62f77555c 100644 --- a/cogl/configure.ac +++ b/cogl/configure.ac @@ -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 "" |