summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-05-23 05:21:28 -0700
committerStefano Karapetsas <[email protected]>2012-05-23 05:21:28 -0700
commit121b4a21809fc4d1b2f6bf8a512212a200fb8ee4 (patch)
treecbdd746c5f17b5b4231f9a118a276d7920243073 /configure.ac
parente9cff2b298ff76555ebc3acffb70a6256f76ac53 (diff)
parent4bbbb6c81461d139c9909e84d46b99a14178c33a (diff)
downloadmate-control-center-121b4a21809fc4d1b2f6bf8a512212a200fb8ee4.tar.bz2
mate-control-center-121b4a21809fc4d1b2f6bf8a512212a200fb8ee4.tar.xz
Merge pull request #7 from MDykstra/master
backward compatible dependency on gmodule-2.0
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index dc4847ad..eed2e43e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,9 @@ dnl ==============================================
dnl Check that we meet the dependencies
dnl ==============================================
+PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
COMMON_MODULES="gtk+-2.0 >= 2.20.0 dnl
+ $GMODULE_ADD dnl
glib-2.0 >= 2.17.4 dnl
gthread-2.0 dnl
gio-2.0 dnl
@@ -128,7 +130,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.1.0)
-PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 mateconf-2.0 gtk+-2.0)
+PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.11 mateconf-2.0 gtk+-2.0)
PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon)
PKG_CHECK_MODULES(GIO, gio-2.0)
@@ -137,7 +139,7 @@ gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
AC_SUBST(GTK_ENGINE_DIR)
-PKG_CHECK_MODULES(GLIB, glib-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD)
dnl
dnl Check dependencies of libslab