X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=d240b6acf8bda20b033e62ef1beda4c3cebe38d3;hp=ff8baa5e52696686461d82d5cf9728e1c5448a0b;hb=c25bc03dc60846090d230cdad21e39faccce35ff;hpb=943f415f81207ea00bf1efe8c2c1cbf13a094a56

diff --git a/configure b/configure
index ff8baa5e..d240b6ac 100755
--- a/configure
+++ b/configure
@@ -1,17 +1,78 @@
 #! /bin/sh
 
+# Set several defaults (optionally specified by the user in
+# environemnt variables)
 CC=${CC:-gcc}
 CXX=${CXX:-g++}
 CFLAGS=${CFLAGS:--O2}
 CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)}
+XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
 
-# defaults
+# Set the defaults for values the user can specify with command-line
+# options.
 PREFIX=/usr/local
 
-# option parsing
+usage ()
+{
+    cat <<EOF
+Usage: ./configure [options]...
+
+This script configures notmuch to build on your system.
+
+It verifies that dependencies are available, determines flags needed
+to compile and link against various required libraries, and identifies
+whether various system functions can be used or if locally-provided
+replacements will be built instead.
+
+Finally, it allows you to control various aspects of the build and
+installation process.
+
+First, some common variables can specified via environment variables:
+
+	CC		The C compiler to use
+	CFLAGS		Flags to pass to the C compiler
+	CXX		The C++ compiler to use
+	CXXFLAGS	Flags to pass to the C compiler
+	LDFLAGS		Flags to pass when linking
+
+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.
+
+	--prefix=PREFIX	Install files in PREFIX [$PREFIX]
+
+By default, "make install" will install the resulting program to
+$PREFIX/bin, documentation to $PREFIX/share, etc. You can
+specify an installation prefix other than $PREFIX using
+--prefix, for instance:
+
+	./configure --prefix=\$HOME
+
+EOF
+}
+
+# Parse command-line options
 for option; do
-    if [ "${option%%=*}" = '--prefix' ] ; then
+    if [ "${option}" = '--help' ] ; then
+	usage
+	exit 0
+    elif [ "${option%%=*}" = '--prefix' ] ; then
 	PREFIX="${option#*=}"
+    else
+	echo "Unrecognized option: ${option}."
+	echo "See:"
+	echo "	$0 --help"
+	echo ""
+	exit 1
     fi
 done
 
@@ -44,14 +105,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