X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=e55f067e4bf696fe8c35228771eebf24804ec9a6;hp=fe46c8e300233ab37cdc052a9db1b49cae089e4c;hb=de4be1b2293699e45d42b6f395b16d854151a58f;hpb=ddb4713b4bf4e7a3dd1845745dc979343e2983ea

diff --git a/configure b/configure
index fe46c8e3..e55f067e 100755
--- a/configure
+++ b/configure
@@ -10,8 +10,8 @@ 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
-versions of notmuch easier for you to use.
+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.
@@ -53,6 +53,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
 
@@ -108,7 +116,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 +127,10 @@ 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
+bash_completion_dir = /etc/bash_completion.d
+CFLAGS += ${have_valgrind}
+EOF