From 910c0b867b856fc047e46dc171ce9d4fe7bf8563 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Thu, 7 Nov 2013 17:54:58 +0100 Subject: Fix configure for Gtk3 --- configure.ac | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac index bc689ac..bc92a46 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,6 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.7 dist-xz no-dist-gzip check-news]) AM_MAINTAINER_MODE -m4_define(required_pygobject_version, 2.15.1) -m4_define(required_pygtk_version, 2.13.0) - dnl put the ACLOCAL flags in the makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -23,50 +20,7 @@ IT_PROG_INTLTOOL([0.40.0]) AM_PATH_PYTHON_VERSION(2.7, 2.7.0, 2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0) -PKG_CHECK_MODULES(MOZO, libmate-menu >= 1.1.0) - -dnl Check for correctly installed pygobject -AC_MSG_CHECKING(for pygobject required_pygobject_version installed for python required_python_abi) -prog=" -import pygtk; pygtk.require('2.0') -import gobject -assert gobject.pygobject_version >= tuple(map(int, 'required_pygobject_version'.split('.'))) -" - -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then - AC_MSG_RESULT(found) -else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(required pygobject version not found) -fi - -dnl Check for correctly installed pygtk -AC_MSG_CHECKING(for pygtk required_pygtk_version installed for python ${PYTHON_VERSION}) -prog=" -import pygtk; pygtk.require('2.0') -import gobject -assert gobject.pygtk_version >= tuple(map(int, 'required_pygtk_version'.split('.'))) -" - -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then - AC_MSG_RESULT(found) -else - AC_MSG_RESULT(not found) - AC_MSG_ERROR(required pygtk version not found) -fi - -dnl Check for correctly installed python-glade -dnl AC_MSG_CHECKING(for pyglade required_pygtk_version installed for python ${PYTHON_VERSION}) -dnl prog=" -dnl import pygtk; pygtk.require('2.0') -dnl import gtk.glade -dnl " -dnl if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then -dnl AC_MSG_RESULT(found) -dnl else -dnl AC_MSG_RESULT(not found) -dnl AC_MSG_ERROR(required pyglade version not found) -dnl fi +PKG_CHECK_MODULES(MOZO, libmate-menu >= 1.1.0 pygobject-3.0) AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update], [Disable icon cache update])) -- cgit v1.2.1