summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-07-12 15:33:28 +0200
committerStefano Karapetsas <[email protected]>2012-07-12 15:33:28 +0200
commit4f9e5e2320f0a27fe676962b71d5160efec479a7 (patch)
treeefdcf581bf8c93067dd739841d0a3f2b0761ea6f /configure.in
parent45959215873762f93accd1384d40b145c007f100 (diff)
parent3fa35a8281ee5088b7e2222b683e5d9191cfd902 (diff)
downloadmate-system-monitor-4f9e5e2320f0a27fe676962b71d5160efec479a7.tar.bz2
mate-system-monitor-4f9e5e2320f0a27fe676962b71d5160efec479a7.tar.xz
Merge branch 'master' of github.com:mate-desktop/mate-system-monitor
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index de5f7ed..eca7e3b 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ MATE_COMPILE_WARNINGS
GLIB_REQUIRED=2.16.0
MATECONF_REQUIRED=1.1.0
-LIBWNCK_REQUIRED=2.5.0
+LIBMATEWNCK_REQUIRED=1.3.0
LIBGTOP_REQUIRED=2.23.1
GTK_REQUIRED=2.20.0
MATE_ICON_THEME_REQUIRED=1.1.0
@@ -37,7 +37,8 @@ LIBXML_REQUIRED=2.0
RSVG_REQUIRED=2.12
DBUS_REQUIRED=0.7
-PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mate-icon-theme >= $MATE_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
+PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
+PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED mateconf-2.0 >= $MATECONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libmatewnck >= $LIBMATEWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mate-icon-theme >= $MATE_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
AC_ARG_ENABLE(more-warnings,