summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2011-08-18 17:17:48 +0100
committerRobert Bragg <robert@linux.intel.com>2011-09-05 19:05:27 +0100
commit69b0db4cdb9beaf9a373418165704b3c7565ace9 (patch)
treeb75699162a53457310aca40ac9aba369482eafaa
parent191d915671aff653b909805ac7369510851ebd05 (diff)
downloadcogl-69b0db4cdb9beaf9a373418165704b3c7565ace9.tar.gz
build: Require gobject-2.0 and gmodule-no-export-2.0
Cogl requires gobject and gmodule API, so we need to check for these and add them to the pkg-config files as dependencies, otherwise building Cogl with --as-needed (like modern distributions now do) will cause build errors. https://bugzilla.gnome.org/show_bug.cgi?id=656809 Reviewed-by: Robert Bragg <robert@linux.intel.com>
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index bc7110d6..5b09b416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,9 +864,9 @@ dnl ============================================================
AM_PATH_GLIB_2_0([glib_req_version],
[have_glib=yes], [have_glib=no],
[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([gobject-2.0 is required]))
-COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0"
+COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES gobject-2.0 gmodule-no-export-2.0"
AC_SUBST(COGL_PKG_REQUIRES)
PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES])
if test -n "$COGL_PKG_REQUIRES_GL"; then