X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=2a0ce9eb41568c017b95e3066e4c21ce2869d87d;hp=ae0a02709e2d611197b1a9903ede242d95897183;hb=af8903df34647d9456e8f3fe26a164959969b451;hpb=9b60dc3cd9224eddfe9bc5cf74eeaa5f0d599d04

diff --git a/configure b/configure
index ae0a0270..2a0ce9eb 100755
--- a/configure
+++ b/configure
@@ -68,6 +68,7 @@ PYTHON=${PYTHON:-}
 PREFIX=/usr/local
 LIBDIR=
 WITH_DOCS=1
+WITH_API_DOCS=1
 WITH_EMACS=1
 WITH_BASH=1
 WITH_RUBY=1
@@ -137,7 +138,8 @@ Some features can be disabled (--with-feature=no is equivalent to
 --without-feature) :
 
 	--without-bash-completion	Do not install bash completions files
-	--without-docs			Do not install documentation and man pages
+	--without-docs			Do not install documentation
+	--without-api-docs		Do not install API man page
 	--without-emacs			Do not install lisp file
 	--without-ruby			Do not install ruby bindings
 	--without-zsh-completion	Do not install zsh completions files
@@ -184,11 +186,21 @@ for option; do
     elif [ "${option%%=*}" = '--with-docs' ]; then
 	if [ "${option#*=}" = 'no' ]; then
 	    WITH_DOCS=0
+	    WITH_API_DOCS=0
 	else
 	    WITH_DOCS=1
 	fi
     elif [ "${option}" = '--without-docs' ] ; then
 	WITH_DOCS=0
+	WITH_API_DOCS=0
+    elif [ "${option%%=*}" = '--with-api-docs' ]; then
+	if [ "${option#*=}" = 'no' ]; then
+	    WITH_API_DOCS=0
+	else
+	    WITH_API_DOCS=1
+	fi
+    elif [ "${option}" = '--without-api-docs' ] ; then
+	WITH_API_DOCS=0
     elif [ "${option%%=*}" = '--with-emacs' ]; then
 	if [ "${option#*=}" = 'no' ]; then
 	    WITH_EMACS=0
@@ -382,6 +394,7 @@ EOF
 	printf "Yes.\n"
     else
 	printf "No.\n"
+	errors=$((errors + 1))
     fi
 
     rm -f _compact.o _compact.cc
@@ -557,7 +570,7 @@ else
 fi
 
 have_doxygen=0
-if [ $WITH_DOCS = "1" ] ; then
+if [ $WITH_API_DOCS = "1" ] ; then
     printf "Checking if doxygen is available... "
     if command -v doxygen > /dev/null; then
 	printf "Yes.\n"
@@ -638,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.
@@ -669,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