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

diff --git a/configure b/configure
index fe46c8e3..1010799d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,15 @@
 #! /bin/sh
 
+# defaults
+PREFIX=/usr/local
+
+# option parsing
+for option; do
+    if [ "${option%=*}" = '--prefix' ] ; then
+	PREFIX="${option#*=}"
+    fi
+done
+
 cat <<EOF
 Welcome to Notmuch, a system for indexing, searching and tagging your email.
 
@@ -10,8 +20,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 +63,23 @@ else
     errors=$((errors + 1))
 fi
 
+if printf 'int main(){return 0;}' | gcc -x c -lz -o /dev/null - > /dev/null 2>&1; then
+    echo "Checking for zlib development files... Yes."
+    have_zlib=1
+else
+    echo "Checking for zlib development files... No."
+    have_zlib=0
+    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
 
@@ -73,13 +100,16 @@ EOF
 	echo "	The talloc library (including development files such as headers)"
 	echo "	http://talloc.samba.org/"
     fi
+    if [ $have_zlib -eq 0 ]; then
+	echo "	The zlib library (including development files such as headers)"
+    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:
 
-	sudo apt-get install libxapian-dev libgmime-2.4-dev libtalloc-dev
+	sudo apt-get install libxapian-dev libgmime-2.4-dev libtalloc-dev libz-dev
 
 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").
@@ -108,7 +138,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 +149,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 = $PREFIX
+bash_completion_dir = /etc/bash_completion.d
+CFLAGS += ${have_valgrind}
+EOF