[Patch v2 01/13] configure: autodetect xapian-1.3

[Tomi Ollila]

On Sat, Mar 26 2016, David Bremner <david at tethera.net> wrote:

> Mimic the handling of python2 versus python3. In particular if both
> xapian-config and xapian-config-1.3 are found, use xapian-config

+1 (this change)

> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index a79f6bd..eb6dbac 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
> @@ -341,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}
> -- 
> 2.6.4