X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=f3498e3ef2448427430e782845ee69375d936ee6;hp=440d678c7eb3828041a24577cf7f1e37bf36c2ab;hb=b191de511e6148112fa2432779f6dc6c7cb501f9;hpb=33c8777a967ece2dd4bbda7e83a4e07c195abf51 diff --git a/configure b/configure index 440d678c..f3498e3e 100755 --- a/configure +++ b/configure @@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-} CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}} CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)} LDFLAGS=${LDFLAGS:-} -XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config} +XAPIAN_CONFIG=${XAPIAN_CONFIG:-} PYTHON=${PYTHON:-} # We don't allow the EMACS or GZIP Makefile variables inherit values @@ -250,7 +250,7 @@ if [ -z "$LIBDIR" ] ; then libdir_expanded="${PREFIX}/lib" else # very non-general variable expansion - libdir_expanded=`echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g"` + libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g") fi cat < /dev/null 2>&1; then xapian_version=$(${xapian_config} --version | sed -e 's/.* //') printf "Yes (%s).\n" ${xapian_version} @@ -371,7 +371,25 @@ if [ ${have_xapian} = "1" ]; then esac fi - +default_xapian_backend="" +if [ ${have_xapian} = "1" ]; then + printf "Testing default Xapian backend... " + cat >_default_backend.cc < +int main(int argc, char** argv) { + Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN); +} +EOF + ${CXX} ${CXXLAGS} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags} + ./_default_backend + if [ -f test.db/iamglass ]; then + default_xapian_backend=glass + else + default_xapian_backend=chert + fi + printf "%s\n" "${default_xapian_backend}"; + rm -rf test.db _default_backend _default_backend.cc +fi # we need to have a version >= 2.6.5 to avoid a crypto bug. We need # 2.6.7 for permissive "From " header handling. GMIME_MINVER=2.6.7 @@ -395,8 +413,9 @@ have_glib=0 if pkg-config --exists 'glib-2.0 >= 2.22'; then printf "Yes.\n" have_glib=1 - glib_cflags=$(pkg-config --cflags glib-2.0) - glib_ldflags=$(pkg-config --libs glib-2.0) + # these are included in gmime cflags and ldflags + # glib_cflags=$(pkg-config --cflags glib-2.0) + # glib_ldflags=$(pkg-config --libs glib-2.0) else printf "No.\n" errors=$((errors + 1)) @@ -443,7 +462,7 @@ for name in ${PYTHON} python python2 python3; do if command -v $name > /dev/null; then have_python=1 python=$name - printf "Yes ($name).\n" + printf "Yes (%s).\n" "$name" break fi done @@ -472,19 +491,11 @@ else fi if [ -z "${EMACSLISPDIR}" ]; then - if pkg-config --exists emacs; then - EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir) - else - EMACSLISPDIR='$(prefix)/share/emacs/site-lisp' - fi + EMACSLISPDIR='$(prefix)/share/emacs/site-lisp' fi if [ -z "${EMACSETCDIR}" ]; then - if pkg-config --exists emacs; then - EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir) - else - EMACSETCDIR='$(prefix)/share/emacs/site-lisp' - fi + EMACSETCDIR='$(prefix)/share/emacs/site-lisp' fi printf "Checking if emacs is available... " @@ -532,7 +543,7 @@ fi libdir_in_ldconfig=0 printf "Checking which platform we are on... " -uname=`uname` +uname=$(uname) if [ $uname = "Darwin" ] ; then printf "Mac OS X.\n" platform=MACOSX @@ -550,11 +561,11 @@ elif [ $uname = "OpenBSD" ] ; then platform=OPENBSD linker_resolves_library_dependencies=0 elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then - printf "$uname\n" + printf "%s\n" "$uname" platform="$uname" linker_resolves_library_dependencies=1 - printf "Checking for $libdir_expanded in ldconfig... " + printf "Checking for %s in ldconfig... " "$libdir_expanded" ldconfig_paths=$(/sbin/ldconfig -N -X -v 2>/dev/null | sed -n -e 's,^\(/.*\):\( (.*)\)\?$,\1,p') # Separate ldconfig_paths only on newline (not on any potential # embedded space characters in any filenames). Note, we use a @@ -805,7 +816,7 @@ for flag in -Wall -Wextra -Wwrite-strings; do WARN_CXXFLAGS="${WARN_CXXFLAGS}${WARN_CXXFLAGS:+ }${flag}" fi done -printf "\n\t${WARN_CXXFLAGS}\n" +printf "\n\t%s\n" "${WARN_CXXFLAGS}" WARN_CFLAGS="${WARN_CXXFLAGS}" printf "Checking for available C compiler warning flags... " @@ -815,7 +826,7 @@ for flag in -Wmissing-declarations; do WARN_CFLAGS="${WARN_CFLAGS}${WARN_CFLAGS:+ }${flag}" fi done -printf "\n\t${WARN_CFLAGS}\n" +printf "\n\t%s\n" "${WARN_CFLAGS}" rm -f minimal minimal.c _libversion.c _libversion _libversion.sh @@ -977,6 +988,10 @@ HAVE_STRCASESTR = ${have_strcasestr} # build its own version) HAVE_STRSEP = ${have_strsep} +# Whether the timegm function is available (if not, then notmuch will +# build its own version) +HAVE_TIMEGM = ${have_timegm} + # Whether struct dirent has d_type (if not, then notmuch will use stat) HAVE_D_TYPE = ${have_d_type} @@ -1005,6 +1020,9 @@ LINKER_RESOLVES_LIBRARY_DEPENDENCIES = ${linker_resolves_library_dependencies} XAPIAN_CXXFLAGS = ${xapian_cxxflags} XAPIAN_LDFLAGS = ${xapian_ldflags} +# Which backend will Xapian use by default? +DEFAULT_XAPIAN_BACKEND = ${default_xapian_backend} + # Flags needed to compile and link against GMime GMIME_CFLAGS = ${gmime_cflags} GMIME_LDFLAGS = ${gmime_ldflags} @@ -1049,6 +1067,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ \$(VALGRIND_CFLAGS) \\ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ -DHAVE_STRSEP=\$(HAVE_STRSEP) \\ + -DHAVE_TIMEGM=\$(HAVE_TIMEGM) \\ -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\ -DSTD_GETPWUID=\$(STD_GETPWUID) \\ -DSTD_ASCTIME=\$(STD_ASCTIME) \\ @@ -1062,6 +1081,7 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ -DHAVE_STRSEP=\$(HAVE_STRSEP) \\ + -DHAVE_TIMEGM=\$(HAVE_TIMEGM) \\ -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\ -DSTD_GETPWUID=\$(STD_GETPWUID) \\ -DSTD_ASCTIME=\$(STD_ASCTIME) \\ @@ -1079,6 +1099,9 @@ cat > sh.config <