isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make building cogl-pango optional

Browse Source 
When building for platforms that don't use pango for handling text
you may not need the cogl-pango library.
This commit is contained in:
Robert Bragg 2011-05-05 21:39:40 +01:00
parent b6ebbc366e
commit 4211462eb2
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,4 +1,8 @@
SUBDIRS = cogl pango SUBDIRS = cogl
if BUILD_COGL_PANGO
SUBDIRS += pango
endif
if COGL_STANDALONE_BUILD if COGL_STANDALONE_BUILD
SUBDIRS += po examples SUBDIRS += po examples

21
configure.ac
View File

@ -170,6 +170,7 @@ AS_CASE(
[ [
test "$cflags_set" = set || CFLAGS="$CFLAGS -g -O0" test "$cflags_set" = set || CFLAGS="$CFLAGS -g -O0"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -DCOGL_GL_DEBUG -DCOGL_OBJECT_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -DCOGL_GL_DEBUG -DCOGL_OBJECT_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG"
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES cairo"
], ],
[no], [no],
[ [
@ -270,6 +271,23 @@ AS_IF(
) )
dnl ============================================================
dnl Should cogl-pango be built?
dnl ============================================================
AC_ARG_ENABLE(
[cogl-pango],
[AC_HELP_STRING([--enable-cogl-pango=@<:@no/yes@:>@], [Enable pango support @<:@default=yes@:>@])],
[],
enable_cogl_pango=yes
)
AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"])
AS_IF([test "x$enable_cogl_pango" = "xyes"],
[
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES pangocairo >= pangocairo_req_version"
]
)
dnl ============================================================ dnl ============================================================
dnl Determine which drivers and window systems we can support dnl Determine which drivers and window systems we can support
@ -645,7 +663,7 @@ AM_PATH_GLIB_2_0([glib_req_version],
[gobject gthread gmodule-no-export]) [gobject gthread gmodule-no-export])
AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required])) AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required]))
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0 pangocairo >= pangocairo_req_version" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0"
AC_SUBST(COGL_PKG_REQUIRES) AC_SUBST(COGL_PKG_REQUIRES)
PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES]) PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES])
@ -739,6 +757,7 @@ if test "x$SUPPORT_EGL" = "xyes"; then
echo " EGL Platforms:${EGL_PLATFORMS}" echo " EGL Platforms:${EGL_PLATFORMS}"
fi fi
echo " Image backend: ${COGL_IMAGE_BACKEND}" echo " Image backend: ${COGL_IMAGE_BACKEND}"
echo " Cogl Pango: ${enable_cogl_pango}"
# Compiler/Debug related flags # Compiler/Debug related flags
echo "" echo ""