diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 16:37:38 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 16:37:38 (GMT) |
| commit | 9bd1bff4d8ab6247e5793c0b78b9bf2581773341 (patch) | |
| tree | 13a4914f0de789d3c6dd9acf70a273f6d34c9230 /configure.ac | |
| parent | e29723a33192cb27b1de83fd8e1abd110bbc1433 (diff) | |
| parent | b1c4a254adc0573221c0d6661459248fd3c507ef (diff) | |
Merge branch 'master' of ../datastore2
Conflicts:
src/olpc/datastore/backingstore.py
src/olpc/datastore/datastore.py
src/olpc/datastore/xapianindex.py
tests/test_sugar.py
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dbcc25d..1531c69 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,21 @@ AC_INIT([sugar-datastore],[0.82.0],[],[sugar-datastore]) AC_PREREQ([2.59]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([configure.ac]) AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + AM_PATH_PYTHON +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_OUTPUT([ Makefile bin/Makefile etc/Makefile -secore/Makefile src/Makefile src/olpc/Makefile src/olpc/datastore/Makefile |