X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=d4f56b905cce45014dca8a27b746f3afac24c5b9;hp=c07a49b059295dca8d60f86de2cd2668b731b89a;hb=8a75fcfa7b90151a7c1b1cf58366a8fc1fd8b70c;hpb=edb485e0b93d0c6b82933708b309d1105bf8d63c diff --git a/configure b/configure index c07a49b0..d4f56b90 100755 --- a/configure +++ b/configure @@ -38,7 +38,7 @@ if [ "$srcdir" != "." ]; then cp -a "$srcdir"/test/* test # Emacs only likes to generate compiled files next to the .el files - # by default so copy these as well (which is not ideal0. + # by default so copy these as well (which is not ideal). cp -a "$srcdir"/emacs/*.el emacs fi @@ -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 @@ -68,18 +68,9 @@ LIBDIR= WITH_DOCS=1 WITH_EMACS=1 WITH_BASH=1 +WITH_RUBY=1 WITH_ZSH=1 -# Compatible GMime versions (with constraints). -# If using GMime 2.6, 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_24_VERSION_CTR='' -GMIME_24_VERSION="gmime-2.4 $GMIME_24_VERSION_CTR" -GMIME_26_VERSION_CTR='>= 2.6.7' -GMIME_26_VERSION="gmime-2.6 $GMIME_26_VERSION_CTR" - -WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION" - usage () { cat < _libversion.c < +#include "lib/notmuch.h" +int main(void) { + printf("libnotmuch_version_major=%d\n", + LIBNOTMUCH_MAJOR_VERSION); + printf("libnotmuch_version_minor=%d\n", + LIBNOTMUCH_MINOR_VERSION); + printf("libnotmuch_version_release=%d\n", + LIBNOTMUCH_MICRO_VERSION); + return 0; +} +EOF +if ${CC} ${CFLAGS} _libversion.c -o _libversion > /dev/null 2>&1 && \ + ./_libversion > _libversion.sh && . ./_libversion.sh +then + printf "OK.\n" +else + cat < /dev/null 2>&1; then have_pkg_config=1 else @@ -314,7 +341,7 @@ fi printf "Checking for Xapian development files... " have_xapian=0 -for xapian_config in ${XAPIAN_CONFIG}; do +for xapian_config in ${XAPIAN_CONFIG} xapian-config xapian-config-1.3; do if ${xapian_config} --version > /dev/null 2>&1; then xapian_version=$(${xapian_config} --version | sed -e 's/.* //') printf "Yes (%s).\n" ${xapian_version} @@ -334,30 +361,47 @@ have_xapian_compact=0 if [ ${have_xapian} = "1" ]; then printf "Checking for Xapian compaction support... " case "${xapian_version}" in - 0.*|1.[01].*|1.2.[0-5]) - printf "No (only available with Xapian > 1.2.6).\n" ;; - [1-9]*.[0-9]*.[0-9]*) - have_xapian_compact=1 - printf "Yes.\n" ;; - *) - printf "Unknown version.\n" ;; + 0.*|1.[01].*|1.2.[0-5]) + printf "No (only available with Xapian > 1.2.6).\n" ;; + [1-9]*.[0-9]*.[0-9]*) + have_xapian_compact=1 + printf "Yes.\n" ;; + *) + printf "Unknown version.\n" ;; esac fi -printf "Checking for GMime development files... " -have_gmime=0 -IFS=';' -for gmimepc in $WITH_GMIME_VERSIONS; do - if pkg-config --exists $gmimepc; then - printf "Yes ($gmimepc).\n" - have_gmime=1 - gmime_cflags=$(pkg-config --cflags $gmimepc) - gmime_ldflags=$(pkg-config --libs $gmimepc) - break +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 -done -IFS=$DEFAULT_IFS -if [ "$have_gmime" = "0" ]; then + 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 + +printf "Checking for GMime development files... " +if pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then + printf "Yes.\n" + have_gmime=1 + gmime_cflags=$(pkg-config --cflags gmime-2.6) + gmime_ldflags=$(pkg-config --libs gmime-2.6) +else + have_gmime=0 printf "No.\n" errors=$((errors + 1)) fi @@ -417,7 +461,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 @@ -446,19 +490,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... " @@ -474,37 +510,39 @@ have_doxygen=0 if [ $WITH_DOCS = "1" ] ; then printf "Checking if doxygen is available... " if command -v doxygen > /dev/null; then - printf "Yes.\n" - have_doxygen=1 + printf "Yes.\n" + have_doxygen=1 else - printf "No (so will not install api docs)\n" + printf "No (so will not install api docs)\n" fi fi -printf "Checking for ruby development files... " -if ruby -e "require 'mkmf'"> /dev/null 2>&1; then - printf "Yes.\n" - have_ruby_dev=1 -else - printf "No (skipping ruby bindings)\n" - have_ruby_dev=0 +have_ruby_dev=0 +if [ $WITH_RUBY = "1" ] ; then + printf "Checking for ruby development files... " + if ruby -e "require 'mkmf'"> /dev/null 2>&1; then + printf "Yes.\n" + have_ruby_dev=1 + else + printf "No (skipping ruby bindings)\n" + fi fi have_sphinx=0 if [ $WITH_DOCS = "1" ] ; then printf "Checking if sphinx is available and supports nroff output... " if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then - printf "Yes.\n" - have_sphinx=1 + printf "Yes.\n" + have_sphinx=1 else - printf "No (so will not install man pages).\n" + printf "No (so will not install man pages).\n" fi 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 @@ -522,11 +560,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 @@ -591,7 +629,7 @@ EOF echo fi if [ $have_gmime -eq 0 ]; then - echo " Either GMime 2.4 library" $GMIME_24_VERSION_CTR "or GMime 2.6 library" $GMIME_26_VERSION_CTR + echo " GMime 2.6 library >= $GMIME_MINVER" echo " (including development files such as headers)" echo " http://spruce.sourceforge.net/gmime/" echo @@ -777,7 +815,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... " @@ -787,9 +825,9 @@ 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 +rm -f minimal minimal.c _libversion.c _libversion _libversion.sh # construct the Makefile.config cat > Makefile.config < sh.config <