diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:55:28 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:55:28 -0800 |
| commit | 815258bb924c3d5f41636714888909eafd3ffe1c (patch) | |
| tree | bec3915821921a4954d6a811217dd28c05ec23ac | |
| parent | 900292308f5997cef5b3e6395cd9f636711e5959 (diff) | |
| parent | f289a01288da50c18d337ce1a8a927422ef65c8b (diff) | |
| download | mate-applets-815258bb924c3d5f41636714888909eafd3ffe1c.tar.bz2 mate-applets-815258bb924c3d5f41636714888909eafd3ffe1c.tar.xz | |
Merge pull request #70 from infirit/master
Require pygobject 3 now that it was ported to gi
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 2a4d6826..28a19b4f 100644 --- a/configure.ac +++ b/configure.ac @@ -24,8 +24,6 @@ HAL_REQUIRED=0.5.3 UPOWER_REQUIRED=0.9.4 DBUS_REQUIRED=1.1.2 DBUS_GLIB_REQUIRED=0.74 -PYGTK_REQUIRED=2.6 -PYGOBJECT_REQUIRED=2.6 MATE_ICON_THEME_REQUIRED=1.1.0 LIBXML_REQUIRED=2.5.0 GUCHARMAP2_REQUIRED=2.33.0 @@ -261,14 +259,7 @@ AC_SUBST(GUCHARMAP_CFLAGS) AC_SUBST(GUCHARMAP_LIBS) dnl -- check for Python modules (optional) ------------------------------ -PYGTK_CFLAGS= -PYGTK_LIBS= -PKG_CHECK_MODULES(PYGTK, - pygtk-2.0 >= $PYGTK_REQUIRED - pygobject-2.0 >= $PYGOBJECT_REQUIRED, - HAVE_PYGTK="yes", HAVE_PYGTK="no") -AC_SUBST(PYGTK_LIBS) -AC_SUBST(PYGTK_CFLAGS) +PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no") dnl -- check for libxml2 (required) ------------------------------------------ PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED) @@ -536,7 +527,7 @@ dnl *************************************************************************** dnl *** invest-applet specific checks *** dnl *************************************************************************** -AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGTK" = "xyes") +AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGOBJECT" = "xyes") dnl *************************************************************************** dnl *** Check if IPv6 is available *** @@ -722,7 +713,7 @@ mate-applets-$VERSION configure summary: - drivemount always - geyes always - mateweather $build_libmateweather_applets - - invest-applet $BUILD_INVEST_APPLET + - invest-applet $HAVE_PYGOBJECT - modemlights $BUILD_MODEM_LIGHTS - multiload $build_gtop_applets - stickynotes $enable_stickynotes |