From 9bd1bff4d8ab6247e5793c0b78b9bf2581773341 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Wed, 08 Oct 2008 16:37:38 +0000
Subject: 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
---
(limited to 'configure.ac')

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
--
cgit v0.9.1