X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=b4770ec9ee2f28a69b2b16c4fba247f03b698543;hp=fe46c8e300233ab37cdc052a9db1b49cae089e4c;hb=986f6c98244610da6bba88d0c92895b9758973ee;hpb=3e4ab913db33991177f8da7ae2d6ce7d11791678

diff --git a/configure b/configure
index fe46c8e3..b4770ec9 100755
--- a/configure
+++ b/configure
@@ -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