X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=f17730441298648bcc31a66992ccd38ef259d6bb;hp=cc6746c10bae638701c582fdcba07386e517aae8;hb=c8934806548ca8c2f60d1150606f67da27cb2546;hpb=fde846cf7dea2ad67418f3f3c9311213b766bfec

diff --git a/configure b/configure
index cc6746c1..f1773044 100755
--- a/configure
+++ b/configure
@@ -274,7 +274,7 @@ if [ -z "$LIBDIR" ] ; then
     libdir_expanded="${PREFIX}/lib"
 else
     # very non-general variable expansion
-    libdir_expanded=$(echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g")
+    libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g")
 fi
 
 cat <<EOF
@@ -394,6 +394,7 @@ EOF
 	printf "Yes.\n"
     else
 	printf "No.\n"
+	errors=$((errors + 1))
     fi
 
     rm -f _compact.o _compact.cc
@@ -683,8 +684,8 @@ EOF
     if [ $have_python -eq 0 ]; then
 	echo "  python interpreter"
     fi
-    if [ $have_xapian -eq 0 ]; then
-	echo "	Xapian library (including development files such as headers)"
+    if [ $have_xapian -eq 0 -o $have_xapian_compact -eq 0 ]; then
+	echo "	Xapian library (>= version 1.2.6, including development files such as headers)"
 	echo "	https://xapian.org/"
     fi
     if [ $have_zlib -eq 0 ]; then