configure: autodetect xapian-1.3

Mimic the handling of python2 versus python3. In particular if both
xapian-config and xapian-config-1.3 are found, use xapian-config
This commit is contained in:
David Bremner 2016-03-26 14:57:11 -03:00
parent 6e6bafed0f
commit d93d3779b8

4
configure vendored
View file

@ -51,7 +51,7 @@ CPPFLAGS=${CPPFLAGS:-}
CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}} CXXFLAGS_for_sh=${CXXFLAGS:-${CFLAGS}}
CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)} CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
LDFLAGS=${LDFLAGS:-} LDFLAGS=${LDFLAGS:-}
XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config} XAPIAN_CONFIG=${XAPIAN_CONFIG:-}
PYTHON=${PYTHON:-} PYTHON=${PYTHON:-}
# We don't allow the EMACS or GZIP Makefile variables inherit values # We don't allow the EMACS or GZIP Makefile variables inherit values
@ -341,7 +341,7 @@ fi
printf "Checking for Xapian development files... " printf "Checking for Xapian development files... "
have_xapian=0 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 if ${xapian_config} --version > /dev/null 2>&1; then
xapian_version=$(${xapian_config} --version | sed -e 's/.* //') xapian_version=$(${xapian_config} --version | sed -e 's/.* //')
printf "Yes (%s).\n" ${xapian_version} printf "Yes (%s).\n" ${xapian_version}