* configure.ac: configuration fixes; set database layout version

This commit is contained in:
Dirk-Jan C. Binnema 2010-01-06 01:22:11 +02:00
parent 376c22772c
commit 525b99f685
1 changed files with 11 additions and 13 deletions

View File

@ -1,4 +1,4 @@
## Copyright (C) 2009 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ## Copyright (C) 2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by ## it under the terms of the GNU General Public License as published by
@ -19,17 +19,15 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/mu.c]) AC_CONFIG_SRCDIR([src/mu.c])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2])
# we set the set the version of the metadata database schema here; # we set the set the version of the Xapian database layout here; it
# it will become part of the db name, so we can automtically # will become part of the db name, so we can automtically recreate the
# recreate the database when we incompatible changes. # database when we incompatible have changes.
# #
# the Xapian and SQLite database share this number, so when # note that MU_XAPIAN_DB_VERSION does not necessarily follow MU
# we upgrade, we can simply update all. # versioning, as we hopefully don't have updates for each version;
# also, this has nothing to do with the version of the Xapian library
# #
# note that MU_DATABASE_VERSION does not necessarily follow AC_DEFINE(MU_XAPIAN_DB_VERSION,["0.6"], [Schema version of the database])
# MU versioning.
#
AC_DEFINE(MU_DATABASE_VERSION,["0.5"], [Schema version of the database])
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@ -68,7 +66,7 @@ AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN" != "xno")
if test "x$XAPIAN" = "xno"; then if test "x$XAPIAN" = "xno"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** xapian could not be found; please install it *** xapian could not be found; please install it
*** in debian/ubuntu the package wouldbe 'libxapian-dev']) *** e.g., in debian/ubuntu the package would be 'libxapian-dev'])
else else
XAPIAN_CXXFLAGS=`$XAPIAN --cxxflags` XAPIAN_CXXFLAGS=`$XAPIAN --cxxflags`
XAPIAN_LIBS=`$XAPIAN --libs` XAPIAN_LIBS=`$XAPIAN --libs`
@ -84,5 +82,5 @@ Makefile
src/Makefile src/Makefile
]) ])
echo
echo "now, type 'make' to build mu, or 'make test' to run the test suite" echo "now, type 'make' to build mu"