diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-06 14:22:49 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-06 14:22:49 -0800 |
| commit | 684e6bb4c072f707a92ce72d85954b5790aaab53 (patch) | |
| tree | e8a449764975fe5066a67c9275ea73c56a88309b /configure.in | |
| parent | 7caef9a314fc9f1fea996d79601d4242286825b1 (diff) | |
| parent | f27253b155db8d3c06bf13801c63bdc282da4157 (diff) | |
| download | mate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.bz2 mate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.xz | |
Merge pull request #10 from NiceandGently/master
port to gsettings
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 083a542..77f831b 100644 --- a/configure.in +++ b/configure.in @@ -24,21 +24,20 @@ AM_PROG_CC_STDC AC_HEADER_STDC MATE_COMPILE_WARNINGS -GLIB_REQUIRED=2.16.0 -MATECONF_REQUIRED=1.1.0 +GLIB_REQUIRED=2.28.0 LIBMATEWNCK_REQUIRED=1.3.0 LIBGTOP_REQUIRED=2.23.1 GTK_REQUIRED=2.20.0 MATE_ICON_THEME_REQUIRED=1.1.0 -GTKMM_REQUIRED=2.8 -GIOMM_REQUIRED=2.16.0 -GLIBMM_REQUIRED=2.14 +GTKMM_REQUIRED=2.22 +GIOMM_REQUIRED=2.26.0 +GLIBMM_REQUIRED=2.22 LIBXML_REQUIRED=2.0 RSVG_REQUIRED=2.12 DBUS_REQUIRED=0.7 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) +PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_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, @@ -65,10 +64,7 @@ fi dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden $CXXFLAGS" dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS" -AC_PATH_PROG(MATECONFTOOL, mateconftool-2) - -AM_MATECONF_SOURCE_2 - +GLIB_GSETTINGS GETTEXT_PACKAGE=mate-system-monitor AC_SUBST(GETTEXT_PACKAGE) |