X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=f17730441298648bcc31a66992ccd38ef259d6bb;hp=fa4c5b5ee3d3dd3051d31190edab142fb87f3f1a;hb=68173a1dc5b1f6408525996467f7dd3025e3f0c6;hpb=188fccd84fc53f44f38a4b184383d63f2c58b5e3

diff --git a/configure b/configure
index fa4c5b5e..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
@@ -650,6 +651,8 @@ elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then
     fi
 else
     printf "Unknown.\n"
+    platform="$uname"
+    linker_resolves_library_dependencies=0
     cat <<EOF
 
 *** Warning: Unknown platform. Notmuch might or might not build correctly.
@@ -681,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