[gcompris/gcomprixogoo] No more check for pysqlite2 unless installed python is 2.4
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris/gcomprixogoo] No more check for pysqlite2 unless installed python is 2.4
- Date: Sat, 12 Jun 2010 20:40:37 +0000 (UTC)
commit fe94fa752d204cbb9ea744bd55bc6868484360fd
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sat Jun 12 17:13:45 2010 +0200
No more check for pysqlite2 unless installed python is 2.4
configure.ac | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 117ac71..7dde568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,22 +510,15 @@ else
if test x$py_build_only = xno; then
AM_CHECK_PYMOD(gtk,,,AC_MSG_ERROR([*** pygtk installed but not visible from python ]))
- dnl AM_CHECK_PYMOD(xml.dom.DOMImplementation,,,AC_MSG_WARN([*** pyxml missing ]))
dnl Set this variable for the .spec.in file
REQUIRE_PYTHON="python pygtk2.0"
- dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas
- dnl gnomecanvas not supported yet in gcompris
- dnl
- dnl AM_CHECK_PYMOD(gnome.canvas,,test_gnomecanvas="no",test_gnomevanvas="yes")
- dnl if test x$test_gnomecanvas = xyes ; then
- dnl AM_CHECK_PYMOD(gnomecanvas,,,AC_MSG_ERROR([*** gnome.canvas or gnomecanvas installed but not visible from python ]))
- dnl fi
-
if test x$with_sqlite = xyes; then
- AM_CHECK_PYMOD(pysqlite2,,,AC_MSG_ERROR([*** pysqlite2 missing ]))
- REQUIRE_PYTHON="$REQUIRE_PYTHON python-sqlite2"
+ if test x$PYTHON_VERSION = x2.4; then
+ AM_CHECK_PYMOD(pysqlite2,,,AC_MSG_ERROR([*** pysqlite2 missing ]))
+ REQUIRE_PYTHON="$REQUIRE_PYTHON python-sqlite2"
+ fi
fi
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]