[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUtrition-commits] /srv/bzr/gnutrition/development r23: configure.in h
|
From: |
Thomas Sinclair |
|
Subject: |
[GNUtrition-commits] /srv/bzr/gnutrition/development r23: configure.in had bzr merge notation ('>>>>', etc). |
|
Date: |
Sun, 22 Jul 2012 16:00:57 -0400 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 23
committer: Thomas Sinclair <address@hidden>
branch nick: development
timestamp: Sun 2012-07-22 16:00:57 -0400
message:
configure.in had bzr merge notation ('>>>>',etc).
Forgot to run autoconf on updated configure.in last commit (fixed).
Added con.create_function('REGEXP', 2, regexp) to sqlite3 initialization and
defined the function 'regexp'. This fixes runtime error when 'REGEXP' is
encountered in a query.
modified:
autom4te.cache/output.0
autom4te.cache/traces.0
configure
configure.in
src/database.py
=== modified file 'autom4te.cache/output.0'
--- a/autom4te.cache/output.0 2012-05-21 00:15:02 +0000
+++ b/autom4te.cache/output.0 2012-07-22 20:00:57 +0000
@@ -1659,8 +1659,8 @@
MAJOR_VERSION=0
-MINOR_VERSION=31.2
-VERSION="0.31.2"
+MINOR_VERSION=32
+VERSION="0.32"
@@ -1707,8 +1707,8 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python >= 2.2" >&5
-$as_echo_n "checking for python >= 2.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python >= 2.6" >&5
+$as_echo_n "checking for python >= 2.6... " >&6; }
prog1="
import sys
@@ -1909,24 +1909,6 @@
**** The python interpreter can't find the python bindings for gtk." "$LINENO"
5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLdb" >&5
-$as_echo_n "checking for MySQLdb... " >&6; }
-prog4="
-import sys
-try:
- import MySQLdb
-except ImportError:
- sys.exit(1)
-sys.exit(0)"
-if $PYTHON -c "$prog4" 1>&5 2>&5
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- as_fn_error $? "
-**** The python interpreter can't find the python bindings for MySQL."
"$LINENO" 5
-fi
-
ac_config_files="$ac_config_files run-gnutrition.py src/install.py Makefile
src/Makefile data/Makefile pixmaps/Makefile doc/Makefile rpm/Makefile
rpm/gnutrition.spec debian/Makefile"
cat >confcache <<\_ACEOF
=== modified file 'autom4te.cache/traces.0'
--- a/autom4te.cache/traces.0 2012-05-21 00:15:02 +0000
+++ b/autom4te.cache/traces.0 2012-07-22 20:00:57 +0000
@@ -1,210 +1,204 @@
-m4trace:configure.in:2: -1- AC_INIT([src/run_app.py])
-m4trace:configure.in:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
-m4trace:configure.in:2: -1- m4_pattern_forbid([_AC_])
-m4trace:configure.in:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS
directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-m4trace:configure.in:2: -1- m4_pattern_allow([^AS_FLAGS$])
-m4trace:configure.in:2: -1- m4_pattern_forbid([^_?m4_])
-m4trace:configure.in:2: -1- m4_pattern_forbid([^dnl$])
-m4trace:configure.in:2: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.in:2: -1- AC_SUBST([SHELL])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([SHELL])
-m4trace:configure.in:2: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.in:2: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_NAME],
[m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_TARNAME],
[m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_VERSION],
[m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_STRING],
[m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_BUGREPORT],
[m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.in:2: -1- AC_SUBST([PACKAGE_URL],
[m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE_URL])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.in:2: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([exec_prefix])
-m4trace:configure.in:2: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.in:2: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([prefix])
-m4trace:configure.in:2: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.in:2: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([program_transform_name])
-m4trace:configure.in:2: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.in:2: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([bindir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.in:2: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([sbindir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.in:2: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([libexecdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.in:2: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([datarootdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.in:2: -1- AC_SUBST([datadir], ['${datarootdir}'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([datadir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.in:2: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([sysconfdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.in:2: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([sharedstatedir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.in:2: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([localstatedir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.in:2: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([includedir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.in:2: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([oldincludedir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.in:2: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+m4trace:configure.in:20: -1- AC_INIT([src/run_app.py])
+m4trace:configure.in:20: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.in:20: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.in:20: -1- m4_pattern_forbid([^LIBOBJS$], [do not use
LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
+m4trace:configure.in:20: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.in:20: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.in:20: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.in:20: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.in:20: -1- AC_SUBST([SHELL])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([SHELL])
+m4trace:configure.in:20: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.in:20: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_NAME],
[m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_NAME])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_TARNAME],
[m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_VERSION],
[m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_STRING],
[m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_STRING])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_BUGREPORT],
[m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:20: -1- AC_SUBST([PACKAGE_URL],
[m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([PACKAGE_URL])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.in:20: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([exec_prefix])
+m4trace:configure.in:20: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.in:20: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([prefix])
+m4trace:configure.in:20: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.in:20: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([program_transform_name])
+m4trace:configure.in:20: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.in:20: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([bindir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.in:20: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([sbindir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.in:20: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([libexecdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.in:20: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.in:20: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([datadir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.in:20: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([sysconfdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.in:20: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([sharedstatedir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.in:20: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([localstatedir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.in:20: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([includedir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.in:20: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([oldincludedir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.in:20: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
['${datarootdir}/doc/${PACKAGE_TARNAME}'],
['${datarootdir}/doc/${PACKAGE}'])])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([docdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.in:2: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([infodir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.in:2: -1- AC_SUBST([htmldir], ['${docdir}'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([htmldir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.in:2: -1- AC_SUBST([dvidir], ['${docdir}'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([dvidir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.in:2: -1- AC_SUBST([pdfdir], ['${docdir}'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([pdfdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.in:2: -1- AC_SUBST([psdir], ['${docdir}'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([psdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.in:2: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([libdir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.in:2: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.in:2: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([mandir])
-m4trace:configure.in:2: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full
name of this package. */
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.in:20: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([infodir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.in:20: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([htmldir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.in:20: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([dvidir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.in:20: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([pdfdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.in:20: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([psdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.in:20: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([libdir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.in:20: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.in:20: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([mandir])
+m4trace:configure.in:20: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full
name of this package. */
@%:@undef PACKAGE_NAME])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one
symbol short name of this package. */
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the
one symbol short name of this package. */
@%:@undef PACKAGE_TARNAME])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the
version of this package. */
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the
version of this package. */
@%:@undef PACKAGE_VERSION])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full
name and version of this package. */
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the
full name and version of this package. */
@%:@undef PACKAGE_STRING])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the
address where bug reports for this package should be sent. */
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the
address where bug reports for this package should be sent. */
@%:@undef PACKAGE_BUGREPORT])
-m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
-m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE_URL$])
-m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home
page for this package. */
+m4trace:configure.in:20: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
+m4trace:configure.in:20: -1- m4_pattern_allow([^PACKAGE_URL$])
+m4trace:configure.in:20: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home
page for this package. */
@%:@undef PACKAGE_URL])
-m4trace:configure.in:2: -1- AC_SUBST([DEFS])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([DEFS])
-m4trace:configure.in:2: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.in:2: -1- AC_SUBST([ECHO_C])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([ECHO_C])
-m4trace:configure.in:2: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.in:2: -1- AC_SUBST([ECHO_N])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([ECHO_N])
-m4trace:configure.in:2: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.in:2: -1- AC_SUBST([ECHO_T])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([ECHO_T])
-m4trace:configure.in:2: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.in:2: -1- AC_SUBST([LIBS])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.in:2: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.in:2: -1- AC_SUBST([build_alias])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([build_alias])
-m4trace:configure.in:2: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.in:2: -1- AC_SUBST([host_alias])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([host_alias])
-m4trace:configure.in:2: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.in:2: -1- AC_SUBST([target_alias])
-m4trace:configure.in:2: -1- AC_SUBST_TRACE([target_alias])
-m4trace:configure.in:2: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.in:5: -1- AC_SUBST([PACKAGE])
-m4trace:configure.in:5: -1- AC_SUBST_TRACE([PACKAGE])
-m4trace:configure.in:5: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.in:10: -1- AC_SUBST([MAJOR_VERSION])
-m4trace:configure.in:10: -1- AC_SUBST_TRACE([MAJOR_VERSION])
-m4trace:configure.in:10: -1- m4_pattern_allow([^MAJOR_VERSION$])
-m4trace:configure.in:11: -1- AC_SUBST([MINOR_VERSION])
-m4trace:configure.in:11: -1- AC_SUBST_TRACE([MINOR_VERSION])
-m4trace:configure.in:11: -1- m4_pattern_allow([^MINOR_VERSION$])
-m4trace:configure.in:12: -1- AC_SUBST([VERSION])
-m4trace:configure.in:12: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.in:12: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.in:15: -1- AC_SUBST([PYTHON])
-m4trace:configure.in:15: -1- AC_SUBST_TRACE([PYTHON])
-m4trace:configure.in:15: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.in:16: -1- AC_SUBST([PYTHON])
-m4trace:configure.in:16: -1- AC_SUBST_TRACE([PYTHON])
-m4trace:configure.in:16: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.in:31: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:31: the top level])
-m4trace:configure.in:31: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:31: the top level])
-m4trace:configure.in:46: -1- AC_SUBST([PYTHON_VERSION])
-m4trace:configure.in:46: -1- AC_SUBST_TRACE([PYTHON_VERSION])
-m4trace:configure.in:46: -1- m4_pattern_allow([^PYTHON_VERSION$])
-m4trace:configure.in:47: -1- AC_SUBST([PYTHON_PREFIX])
-m4trace:configure.in:47: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
-m4trace:configure.in:47: -1- m4_pattern_allow([^PYTHON_PREFIX$])
-m4trace:configure.in:48: -1- AC_SUBST([PYTHON_SITE_DIR])
-m4trace:configure.in:48: -1- AC_SUBST_TRACE([PYTHON_SITE_DIR])
-m4trace:configure.in:48: -1- m4_pattern_allow([^PYTHON_SITE_DIR$])
-m4trace:configure.in:50: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.in:50: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.in:50: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.in:50: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.in:50: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.in:50: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.in:50: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.in:50: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.in:50: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.in:50: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.in:51: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.in:51: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.in:51: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.in:62: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:62: the top level])
-m4trace:configure.in:62: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:62: the top level])
-m4trace:configure.in:79: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:79: the top level])
-m4trace:configure.in:79: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
-configure.in:79: the top level])
-m4trace:configure.in:87: -1- AC_CONFIG_FILES([run-gnutrition.py\
+m4trace:configure.in:20: -1- AC_SUBST([DEFS])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([DEFS])
+m4trace:configure.in:20: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.in:20: -1- AC_SUBST([ECHO_C])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([ECHO_C])
+m4trace:configure.in:20: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.in:20: -1- AC_SUBST([ECHO_N])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([ECHO_N])
+m4trace:configure.in:20: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.in:20: -1- AC_SUBST([ECHO_T])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([ECHO_T])
+m4trace:configure.in:20: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.in:20: -1- AC_SUBST([LIBS])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.in:20: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:20: -1- AC_SUBST([build_alias])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([build_alias])
+m4trace:configure.in:20: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.in:20: -1- AC_SUBST([host_alias])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([host_alias])
+m4trace:configure.in:20: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.in:20: -1- AC_SUBST([target_alias])
+m4trace:configure.in:20: -1- AC_SUBST_TRACE([target_alias])
+m4trace:configure.in:20: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.in:23: -1- AC_SUBST([PACKAGE])
+m4trace:configure.in:23: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.in:23: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.in:28: -1- AC_SUBST([MAJOR_VERSION])
+m4trace:configure.in:28: -1- AC_SUBST_TRACE([MAJOR_VERSION])
+m4trace:configure.in:28: -1- m4_pattern_allow([^MAJOR_VERSION$])
+m4trace:configure.in:29: -1- AC_SUBST([MINOR_VERSION])
+m4trace:configure.in:29: -1- AC_SUBST_TRACE([MINOR_VERSION])
+m4trace:configure.in:29: -1- m4_pattern_allow([^MINOR_VERSION$])
+m4trace:configure.in:30: -1- AC_SUBST([VERSION])
+m4trace:configure.in:30: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.in:30: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:33: -1- AC_SUBST([PYTHON])
+m4trace:configure.in:33: -1- AC_SUBST_TRACE([PYTHON])
+m4trace:configure.in:33: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.in:34: -1- AC_SUBST([PYTHON])
+m4trace:configure.in:34: -1- AC_SUBST_TRACE([PYTHON])
+m4trace:configure.in:34: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:49: the top level])
+m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:49: the top level])
+m4trace:configure.in:64: -1- AC_SUBST([PYTHON_VERSION])
+m4trace:configure.in:64: -1- AC_SUBST_TRACE([PYTHON_VERSION])
+m4trace:configure.in:64: -1- m4_pattern_allow([^PYTHON_VERSION$])
+m4trace:configure.in:65: -1- AC_SUBST([PYTHON_PREFIX])
+m4trace:configure.in:65: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
+m4trace:configure.in:65: -1- m4_pattern_allow([^PYTHON_PREFIX$])
+m4trace:configure.in:66: -1- AC_SUBST([PYTHON_SITE_DIR])
+m4trace:configure.in:66: -1- AC_SUBST_TRACE([PYTHON_SITE_DIR])
+m4trace:configure.in:66: -1- m4_pattern_allow([^PYTHON_SITE_DIR$])
+m4trace:configure.in:68: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.in:68: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.in:68: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.in:68: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.in:68: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.in:68: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.in:69: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.in:69: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.in:69: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:80: the top level])
+m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is
obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:385: AC_FD_CC is
expanded from...
+configure.in:80: the top level])
+m4trace:configure.in:88: -1- AC_CONFIG_FILES([run-gnutrition.py\
src/install.py\
Makefile\
src/Makefile\
@@ -214,21 +208,21 @@
rpm/Makefile\
rpm/gnutrition.spec\
debian/Makefile])
-m4trace:configure.in:87: -1- _m4_warn([obsolete], [AC_OUTPUT should be used
without arguments.
+m4trace:configure.in:88: -1- _m4_warn([obsolete], [AC_OUTPUT should be used
without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:87: -1- AC_SUBST([LIB@&address@hidden, [$ac_libobjs])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([LIB@&address@hidden)
-m4trace:configure.in:87: -1- m4_pattern_allow([^LIB@&address@hidden)
-m4trace:configure.in:87: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.in:87: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:87: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:88: -1- AC_SUBST([LIB@&address@hidden, [$ac_libobjs])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([LIB@&address@hidden)
+m4trace:configure.in:88: -1- m4_pattern_allow([^LIB@&address@hidden)
+m4trace:configure.in:88: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:88: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([INSTALL])
=== modified file 'configure'
--- a/configure 2012-05-21 00:15:02 +0000
+++ b/configure 2012-07-22 20:00:57 +0000
@@ -1659,8 +1659,8 @@
MAJOR_VERSION=0
-MINOR_VERSION=31.2
-VERSION="0.31.2"
+MINOR_VERSION=32
+VERSION="0.32"
@@ -1707,8 +1707,8 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python >= 2.2" >&5
-$as_echo_n "checking for python >= 2.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python >= 2.6" >&5
+$as_echo_n "checking for python >= 2.6... " >&6; }
prog1="
import sys
@@ -1909,24 +1909,6 @@
**** The python interpreter can't find the python bindings for gtk." "$LINENO"
5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLdb" >&5
-$as_echo_n "checking for MySQLdb... " >&6; }
-prog4="
-import sys
-try:
- import MySQLdb
-except ImportError:
- sys.exit(1)
-sys.exit(0)"
-if $PYTHON -c "$prog4" 1>&5 2>&5
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- as_fn_error $? "
-**** The python interpreter can't find the python bindings for MySQL."
"$LINENO" 5
-fi
-
ac_config_files="$ac_config_files run-gnutrition.py src/install.py Makefile
src/Makefile data/Makefile pixmaps/Makefile doc/Makefile rpm/Makefile
rpm/gnutrition.spec debian/Makefile"
cat >confcache <<\_ACEOF
=== modified file 'configure.in'
--- a/configure.in 2012-06-26 19:06:03 +0000
+++ b/configure.in 2012-07-22 20:00:57 +0000
@@ -23,11 +23,8 @@
AC_SUBST(PACKAGE)
MAJOR_VERSION=0
-<<<<<<< TREE
MINOR_VERSION=32
VERSION="0.32"
-=======
->>>>>>> MERGE-SOURCE
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
AC_SUBST(VERSION)
=== modified file 'src/database.py'
--- a/src/database.py 2012-06-26 19:06:03 +0000
+++ b/src/database.py 2012-07-22 20:00:57 +0000
@@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import sqlite3 as dbms
import datetime, time
+import re
def ticks():
return time.time()
@@ -31,6 +32,10 @@
dbms.register_adapter(datetime.datetime, curtime)
dbms.register_adapter(datetime.datetime, curdate)
+def regexp(exp, text):
+ """Define a function to be called when sqlite3 module sees 'REGEXP'"""
+ return re.search(exp, text) is not None
+
class Database:
_shared_state = {}
def __init__(self):
@@ -43,17 +48,18 @@
self.user = config.user
dbfile = path.join(config.udir, 'gnutr_db')
try:
- self.db = dbms.connect(dbfile)
+ con = dbms.connect(dbfile)
except self.Error, e:
"Error {0:s}:".format(e.args[0])
raise self.Error
- else:
- # text_factory must be set to 'str' due to current limitations
- # in csv.reader()
- self.db.text_factory = str
- self.cursor = self.db.cursor()
- self.rows = 0
- self.result = None
+ # text_factory must be set to 'str' due to current limitations
+ # in csv.reader()
+ con.text_factory = str
+ con.create_function('REGEXP', 2, regexp)
+ self.con = con
+ self.cursor = con.cursor()
+ self.rows = 0
+ self.result = None
def initialize(self):
# Create Food Description (food_des) table.
@@ -233,7 +239,7 @@
"goal_val REAL NOT NULL)", 'nutr_goal')
self.cursor.close()
- self.cursor = self.db.cursor()
+ self.cursor = self.con.cursor()
return 1
def curtime(self):
@@ -255,6 +261,7 @@
else:
self.cursor.execute(sql)
except self.Error, sqlerr:
+ self.con.rollback()
import sys
print 'Error :', sqlerr, '\nquery:', sql
if caller: print 'Caller ', caller
@@ -264,7 +271,7 @@
self.result = tuple(result)
self.last_query = sql
self.last_query_params = sql_params
- self.db.commit()
+ self.con.commit()
def get_result(self):
result = self.result
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUtrition-commits] /srv/bzr/gnutrition/development r23: configure.in had bzr merge notation ('>>>>', etc).,
Thomas Sinclair <=