--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Recoll 1.19.0.
+# Generated by GNU Autoconf 2.69 for Recoll 1.19.5.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='Recoll'
PACKAGE_TARNAME='recoll'
-PACKAGE_VERSION='1.19.0'
-PACKAGE_STRING='Recoll 1.19.0'
+PACKAGE_VERSION='1.19.5'
+PACKAGE_STRING='Recoll 1.19.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -652,7 +652,9 @@
CXXCPP
XMKMF
QMAKEPATH
-XAPIAN_CONFIG
+XAPIAN_CONFIG2
+XAPIAN_CONFIG1
+XAPIAN_CONFIG0
aspellProg
fileProg
EGREP
@@ -1279,7 +1281,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Recoll 1.19.0 to adapt to many kinds of systems.
+\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1344,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Recoll 1.19.0:";;
+ short | recursive ) echo "Configuration of Recoll 1.19.5:";;
esac
cat <<\_ACEOF
@@ -1473,7 +1475,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Recoll configure 1.19.0
+Recoll configure 1.19.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2026,7 +2028,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Recoll $as_me 1.19.0, which was
+It was created by Recoll $as_me 1.19.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2890,7 +2892,7 @@
as_fn_error $? "C++ compiler needed. Please install one (ie: gnu g++)" "$LINENO" 5
fi
-sys=`uname | tr / _`
+sys=`uname | tr / _ | awk -F_ '{print $1}'`
if test ! -f mk/$sys ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}:
@@ -4452,12 +4454,12 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
LIBICONV=""
-S_LDFLAGS=$LDFLAGS
+S_LIBS=$LIBS
S_CPPFLAGS=$CPPFLAGS
-for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
+for dir in ${libdir} /opt/local/lib /usr/local/lib;do
CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
- LDFLAGS="$S_LDFLAGS -L$dir"
+ LIBS="$S_LIBS -L$dir"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4482,7 +4484,7 @@
break
fi
- LDFLAGS="$S_LDFLAGS -L$dir -liconv"
+ LIBS="$S_LIBS -L$dir -liconv"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -4508,7 +4510,7 @@
done
-LDFLAGS=$S_LDFLAGS
+LIBS=$S_LIBS
CPPFLAGS=$S_CPPFLAGS
if test A"$LIBICONV" = A ; then
@@ -4581,17 +4583,20 @@
fi
-#### Look for Xapian
-# Extract the first word of "xapian-config", so it can be a program name with args.
+#### Look for Xapian. Done in a strange way to work around autoconf
+# cache
+XAPIAN_CONFIG=no
+if test "$XAPIAN_CONFIG" = "no"; then
+ # Extract the first word of "xapian-config", so it can be a program name with args.
set dummy xapian-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XAPIAN_CONFIG+:} false; then :
+if ${ac_cv_path_XAPIAN_CONFIG0+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $XAPIAN_CONFIG in
+ case $XAPIAN_CONFIG0 in
[\\/]* | ?:[\\/]*)
- ac_cv_path_XAPIAN_CONFIG="$XAPIAN_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_XAPIAN_CONFIG0="$XAPIAN_CONFIG0" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4601,7 +4606,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_XAPIAN_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_XAPIAN_CONFIG0="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4609,19 +4614,110 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_XAPIAN_CONFIG" && ac_cv_path_XAPIAN_CONFIG="no"
+ test -z "$ac_cv_path_XAPIAN_CONFIG0" && ac_cv_path_XAPIAN_CONFIG0="no"
;;
esac
fi
-XAPIAN_CONFIG=$ac_cv_path_XAPIAN_CONFIG
-if test -n "$XAPIAN_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAPIAN_CONFIG" >&5
-$as_echo "$XAPIAN_CONFIG" >&6; }
+XAPIAN_CONFIG0=$ac_cv_path_XAPIAN_CONFIG0
+if test -n "$XAPIAN_CONFIG0"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAPIAN_CONFIG0" >&5
+$as_echo "$XAPIAN_CONFIG0" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+
+ XAPIAN_CONFIG=$XAPIAN_CONFIG0
+fi
+if test "$XAPIAN_CONFIG" = "no"; then
+ # Extract the first word of "xapian-config-1.3", so it can be a program name with args.
+set dummy xapian-config-1.3; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XAPIAN_CONFIG1+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $XAPIAN_CONFIG1 in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XAPIAN_CONFIG1="$XAPIAN_CONFIG1" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XAPIAN_CONFIG1="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_XAPIAN_CONFIG1" && ac_cv_path_XAPIAN_CONFIG1="no"
+ ;;
+esac
+fi
+XAPIAN_CONFIG1=$ac_cv_path_XAPIAN_CONFIG1
+if test -n "$XAPIAN_CONFIG1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAPIAN_CONFIG1" >&5
+$as_echo "$XAPIAN_CONFIG1" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ XAPIAN_CONFIG=$XAPIAN_CONFIG1
+fi
+if test "$XAPIAN_CONFIG" = "no"; then
+ # Extract the first word of "xapian-config-1.1", so it can be a program name with args.
+set dummy xapian-config-1.1; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XAPIAN_CONFIG2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $XAPIAN_CONFIG2 in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XAPIAN_CONFIG2="$XAPIAN_CONFIG2" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XAPIAN_CONFIG2="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_XAPIAN_CONFIG2" && ac_cv_path_XAPIAN_CONFIG2="no"
+ ;;
+esac
+fi
+XAPIAN_CONFIG2=$ac_cv_path_XAPIAN_CONFIG2
+if test -n "$XAPIAN_CONFIG2"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAPIAN_CONFIG2" >&5
+$as_echo "$XAPIAN_CONFIG2" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ XAPIAN_CONFIG=$XAPIAN_CONFIG2
+fi
if test "$XAPIAN_CONFIG" = "no" ; then
as_fn_error $? "Cannot find xapian-config command in $PATH. Is
@@ -6259,7 +6355,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Recoll $as_me 1.19.0, which was
+This file was extended by Recoll $as_me 1.19.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6321,7 +6417,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Recoll config.status 1.19.0
+Recoll config.status 1.19.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"