X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=2ceda74bc65c3d237ab3449340533b495a086d49;hp=b1ac741d32d6361aaec4643bc21508ff39104aa3;hb=6320695223e466a285a77fe0d30fff0ff5e89172;hpb=d4a765b63e70254273c0fd5673056ad2a456a96c

diff --git a/configure b/configure
index b1ac741d..2ceda74b 100755
--- a/configure
+++ b/configure
@@ -28,38 +28,42 @@ else
     have_pkg_config=0
 fi
 
+printf "Checking for Xapian development files... "
 if xapian-config --version > /dev/null 2>&1; then
-    echo "Checking for Xapian development files... Yes."
+    printf "Yes.\n"
     have_xapian=1
 else
-    echo "Checking for Xapian development files... No."
+    printf "No.\n"
     have_xapian=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for GMime 2.4 development files... "
 if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then
-    echo "Checking for GMime 2.4 development files... Yes."
+    printf "Yes.\n"
     have_gmime=1
 else
-    echo "Checking for GMime 2.4 development files... No."
+    printf "No.\n"
     have_gmime=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for talloc development files... "
 if pkg-config --modversion talloc > /dev/null 2>&1; then
-    echo "Checking for talloc development files... Yes."
+    printf "Yes.\n"
     have_talloc=1
 else
-    echo "Checking for talloc development files... No."
+    printf "No.\n"
     have_talloc=0
     errors=$((errors + 1))
 fi
 
+printf "Checking for valgrind development files... "
 if pkg-config --modversion valgrind > /dev/null 2>&1; then
-    echo "Checking for valgrind development files... Yes."
+    printf "Yes.\n"
     have_valgrind=-DHAVE_VALGRIND
 else
-    echo "Checking for valgrind development files... No."
+    printf "No (but that's fine).\n"
     have_valgrind=
 fi
 
@@ -106,8 +110,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
@@ -133,6 +137,5 @@ EOF
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 prefix = /usr/local
-bash_completion_dir = /etc/bash_completion.d
 CFLAGS += ${have_valgrind}
 EOF