Merge branch 'upstream'

diff --combined configure
index c6e0c09a8f8014c9458c9461ae59094c49e56e05,d240b6acf8bda20b033e62ef1beda4c3cebe38d3..a64f3a0183d2dc893599a3fa1fbb09ba74430db3
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -6,6 -6,7 +6,7 @@@ CC=${CC:-gcc
  CXX=${CXX:-g++}
  CFLAGS=${CFLAGS:--O2}
  CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
+ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
  
  # Set the defaults for values the user can specify with command-line
  # options.
@@@ -37,6 -38,13 +38,13 @@@ First, some common variables can specif
  Each of these values can further be controlled by specifying them
  later on the "make" command line.
  
+ Other environment variables can be used to control configure itself,
+ (and for which there is no equivalent build-time control):
+ 
+       XAPIAN_CONFIG   The program to use to determine flags for
+                       compiling and linking against the Xapian
+                       library. [$XAPIAN_CONFIG]
+ 
  Additionally, various options can be specified on the configure
  command line.
  
@@@ -59,6 -67,12 +67,6 @@@ for option; d
        exit 0
      elif [ "${option%%=*}" = '--prefix' ] ; then
        PREFIX="${option#*=}"
 -    else
 -      echo "Unrecognized option: ${option}."
 -      echo "See:"
 -      echo "  $0 --help"
 -      echo ""
 -      exit 1
      fi
  done
  
@@@ -91,14 -105,18 +99,18 @@@ els
  fi
  
  printf "Checking for Xapian development files... "
- if xapian-config --version > /dev/null 2>&1; then
-     printf "Yes.\n"
-     have_xapian=1
-     xapian_cxxflags=$(xapian-config --cxxflags)
-     xapian_ldflags=$(xapian-config --libs)
- else
+ have_xapian=0
+ for xapian_config in ${XAPIAN_CONFIG}; do
+     if ${xapian_config} --version > /dev/null 2>&1; then
+       printf "Yes.\n"
+       have_xapian=1
+       xapian_cxxflags=$(${xapian_config} --cxxflags)
+       xapian_ldflags=$(${xapian_config} --libs)
+       break
+     fi
+ done
+ if [ ${have_xapian} = "0" ]; then
      printf "No.\n"
-     have_xapian=0
      errors=$((errors + 1))
  fi