summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2011-12-30 06:22:42 -0800
committerStefano Karapetsas <[email protected]>2011-12-30 06:22:42 -0800
commit6f2018c7a34c7d87ef6c055bcf07ec6e3b9c0b25 (patch)
treef5d432f265fa2240fe66543a11b4f5638977269b /configure.ac
parentcfa7ef22687d8b4c45f3d7f4921e7eee14d7d0c1 (diff)
parent558e32cb739aa14ab0eaee2b94fb3d455fc376ab (diff)
downloadmate-power-manager-6f2018c7a34c7d87ef6c055bcf07ec6e3b9c0b25.tar.bz2
mate-power-manager-6f2018c7a34c7d87ef6c055bcf07ec6e3b9c0b25.tar.xz
Merge pull request #4 from samtygier/master
if glib > 2.30, then need to use unique-3.0, to avoid deprecated G_CONST_RETURN need testing on debian/ubuntu and arch
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 560885d..5d907d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,11 @@ PKG_CHECK_EXISTS(
PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify >= $LIBMATENOTIFY_REQUIRED)
-PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
+dnl if glib is > 2.30, then unique-3.0 is needed
+PKG_CHECK_EXISTS(glib-2.0 >= 2.30.0,
+ [PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)],
+ [PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)]
+)
PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED)