hamster-applet r646 - branches/gnome-2-24

[pzawadzki svn gnome org]

Author: pzawadzki
Date: Fri Nov 28 13:35:20 2008
New Revision: 646
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=646&view=rev

Log:
Reverse the sqlite check to accomodate for python 2.6 and 3.0


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/configure.ac

Modified: branches/gnome-2-24/configure.ac
==============================================================================
--- branches/gnome-2-24/configure.ac	(original)
+++ branches/gnome-2-24/configure.ac	Fri Nov 28 13:35:20 2008
@@ -100,13 +100,13 @@
 AC_MSG_RESULT($PYGTK_DEFSDIR)
 
 
-if test "x$PYTHON_VERSION" = "x2.5"; then
-    AC_MSG_CHECKING([for python sqlite module])
+if test "x$PYTHON_VERSION" = "x2.4"; then
+    AC_MSG_CHECKING([for pysqlite2 module])
     if AC_RUN_LOG([DISPLAY= $PYTHON -c '
 try:
-    import sqlite3
+    import pysqlite2
 except ImportError, e:
-    if str(e).find("sqlite3") >= 0:
+    if str(e).find("pysqlite2") >= 0:
         raise
 except:
     pass
@@ -114,15 +114,15 @@
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Python 2.5: inbuilt sqlite is required to build hamster])
+      AC_MSG_ERROR([Python 2.4: pysqlite2 module required to build hamster])
     fi
 else
-    AC_MSG_CHECKING([for pysqlite2 module])
+    AC_MSG_CHECKING([for python sqlite module])
     if AC_RUN_LOG([DISPLAY= $PYTHON -c '
 try:
-    import pysqlite2
+    import sqlite3
 except ImportError, e:
-    if str(e).find("pysqlite2") >= 0:
+    if str(e).find("sqlite3") >= 0:
         raise
 except:
     pass
@@ -130,7 +130,7 @@
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Python 2.4: pysqlite2 module required to build hamster])
+      AC_MSG_ERROR([Python 2.5+: inbuilt sqlite is required to build hamster])
     fi
 fi