[gjs: 8/9] build: Add glib-2.0 and gio-2.0 to public pkg-config requirements
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 8/9] build: Add glib-2.0 and gio-2.0 to public pkg-config requirements
- Date: Fri, 30 Aug 2019 21:15:52 +0000 (UTC)
commit 4a29712a5652fd85d4e8ae325955e7f1c52b6f9f
Author: Philip Chimento <philip endlessm com>
Date: Thu Aug 29 10:13:47 2019 +0300
build: Add glib-2.0 and gio-2.0 to public pkg-config requirements
We do have some GLib and GIO symbols in public APIs, for example a GFile
parameter in gjs/coverage.h and also GError parameters. So we do need to
include these in the public pkg-config requirements.
configure.ac | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d1f44d15..6ecb3281 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,14 +65,18 @@ m4_define(glib_required_version, 2.58.0)
GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
+GLIB_REQUIREMENT="glib-2.0 >= glib_required_version"
GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
+GIO_REQUIREMENT="gio-2.0 >= glib_required_version"
gjs_base_packages="$GOBJECT_REQUIREMENT gio-2.0"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-60"
+common_packages="gthread-2.0 $GIO_REQUIREMENT mozjs-60"
gjs_packages="gobject-introspection-1.0 libffi $common_packages"
gjs_cairo_packages="cairo cairo-gobject $common_packages"
gjs_sysprof_packages="sysprof-capture-3 >= 3.33.2"
-AX_PKG_CHECK_MODULES([GJS], [$GOBJECT_REQUIREMENT], [$gjs_packages])
+AX_PKG_CHECK_MODULES([GJS],
+ [$GLIB_REQUIREMENT $GOBJECT_REQUIREMENT $GIO_REQUIREMENT],
+ [$gjs_packages])
dnl These don't need to be put in the .pc file so use regular PKG_CHECK_MODULES
PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_base_packages])
PKG_CHECK_MODULES([GJS_CONSOLE], [$gjs_base_packages])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]