X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=d240b6acf8bda20b033e62ef1beda4c3cebe38d3;hp=7180e5e725e4a0d9bc9233915db558532e9e8d5a;hb=406ec4b15d65f1104c7ff3ee654a5e9cd5b39f29;hpb=8696882443048c0c31caf62e182dddb8cf8c2498

diff --git a/configure b/configure
index 7180e5e7..d240b6ac 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,80 @@
 #! /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}
+
+# Set the defaults for values the user can specify with command-line
+# options.
+PREFIX=/usr/local
+
+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}" = '--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
 
 cat <<EOF
 Welcome to Notmuch, a system for indexing, searching and tagging your email.
@@ -32,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
 
@@ -106,18 +183,20 @@ EOF
     fi
     cat <<EOF
 
-On a modern, package-based operating system such as Debian, you can
-install all of the dependencies with the following simple command
-line:
+With any luck, you're using a modern, package-based operating system
+that has all of these packages available in the distribution. In that
+case a simple command will install everything you need. For example:
+
+On Debian and similar systems:
 
 	sudo apt-get install libxapian-dev libgmime-2.4-dev libtalloc-dev
 
-Or on Fedora or other RPM-based systems:
+Or on Fedora and similar systems:
 
 	sudo yum install xapian-core-devel gmime-devel libtalloc-devel
 
-On other systems, a similar command can be used, but the details of the 
-package names may be different, (such as "devel" in place of "dev").
+On other systems, similar commands can be used, but the details of the
+package names may be different.
 
 EOF
     if [ $have_pkg_config -eq 0 ]; then
@@ -128,7 +207,6 @@ the various libraries needed by notmuch. It's possible you simply need
 to install pkg-config with a command such as:
 
 	sudo apt-get install pkg-config
-
 Or:
 	sudo yum install pkgconfig
 
@@ -184,8 +262,14 @@ CC = ${CC}
 # The C++ compiler to use
 CXX = ${CXX}
 
+# Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
+CFLAGS = ${CFLAGS}
+
+# Default FLAGS for C++ compiler (can be overridden by user such as "make CXXFLAGS=-g")
+CXXFLAGS = ${CXXFLAGS}
+
 # The prefix to which notmuch should be installed
-prefix = /usr/local
+prefix = ${PREFIX}
 
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
@@ -202,7 +286,7 @@ XAPIAN_LDFLAGS = ${xapian_ldflags}
 GMIME_CFLAGS = ${gmime_cflags}
 GMIME_LDFLAGS = ${gmime_ldflags}
 
-# Flags needed to compile and linke against talloc
+# Flags needed to compile and link against talloc
 TALLOC_CFLAGS = ${talloc_cflags}
 TALLOC_LDFLAGS = ${talloc_ldflags}
 
@@ -213,11 +297,11 @@ HAVE_VALGRIND = ${have_valgrind}
 VALGRIND_CFLAGS = ${valgrind_cflags}
 
 # Combined flags for compiling and linking against all of the above
-override CFLAGS += -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\
+CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\
 		   \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\
 		   \$(VALGRIND_CFLAGS)
-override CXXFLAGS += -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\
+CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\
 		     \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
 		     \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)
-override LDFLAGS += \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
+CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
 EOF