X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=a64f3a0183d2dc893599a3fa1fbb09ba74430db3;hp=fa8e142bb786e0450992abe823c6a9ee26bffb9e;hb=0ea5f3fc0e0336921ba670a28201b59d2c977cfb;hpb=e72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d

diff --git a/configure b/configure
index fa8e142b..a64f3a01 100755
--- a/configure
+++ b/configure
@@ -6,6 +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 @@ First, some common variables can specified via environment variables:
 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,12 +67,6 @@ for option; do
 	exit 0
     elif [ "${option%%=*}" = '--prefix' ] ; then
 	PREFIX="${option#*=}"
-    else
-	echo "Unrecognized option: ${option}."
-	echo "See:"
-	echo "	$0 --help"
-	echo ""
-	exit 1
     fi
 done
 
@@ -97,14 +99,18 @@ else
 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