Makefile: Add new "install-bash" target for bash completion support

[notmuch] / configure

diff --git a/configure b/configure
index fe46c8e300233ab37cdc052a9db1b49cae089e4c..140711f32f38587ab792955aa0dbb22cd05ded6c 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,14 +7,16 @@ We hope that the process of building and installing notmuch is quick
 and smooth so that you can soon be reading and processing your email
 more efficiently than ever.
 
-If anything goes wrong in this process, please do as much as you can
-to figure out what could be different on your machine compared to
-those of the notmuch developers. Then, please email those details to
-Carl Worth <cworth@cworth.org> so that we can hopefully make future
+If anything goes wrong in the configure process, you can override any
+decisions it makes by manually editing the Makefile.config file that
+it creates. Also please do as much as you can to figure out what could
+be different on your machine compared to those of the notmuch
+developers. Then, please email those details to the Notmuch list
+(notmuch@notmuchmail.org) so that we can hopefully make future
 versions of notmuch easier for you to use.
 
-We'll now investigate your system to find verify that various software
-components that notmuch relies on are available.
+We'll now investigate your system to verify that all required
+dependencies are available:
 
 EOF
 
@@ -53,6 +55,14 @@ else
     errors=$((errors + 1))
 fi
 
+if pkg-config --modversion valgrind > /dev/null 2>&1; then
+    echo "Checking for valgrind development files... Yes."
+    have_valgrind=-DHAVE_VALGRIND
+else
+    echo "Checking for valgrind development files... No."
+    have_valgrind=
+fi
+
 if [ $errors -gt 0 ]; then
     cat <<EOF
 
@@ -96,8 +106,8 @@ with a command such as:
        sudo apt-get install pkg-config
 
 But if pkg-config is not available for your system, then you will need
-to manually edit the notmuch Makefile to set NOTMUCH_CFLAGS and
-NOTMUCH_LDFLAGS to the correct values without calling pkg-config.
+to manually edit the notmuch Makefile to set the variables such as
+CFLAGS and LDFLAGS to the correct values without calling pkg-config.
 
 EOF
     fi
@@ -108,7 +118,8 @@ configure again to ensure the packages can be found, or simply run
 
 EOF
     exit 1
-else
+fi
+
 cat <<EOF
 
 All required packages were found. You may now run the following
@@ -118,6 +129,9 @@ commands to compile and install notmuch:
        sudo make install
 
 EOF
-    exit 0
-fi
-cat <<EOF
+
+# construct the Makefile.config
+cat > Makefile.config <<EOF
+prefix = /usr/local
+CFLAGS += ${have_valgrind}
+EOF