X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=20fbed620e14883651091a473805ca21edbf24db;hp=c07a49b059295dca8d60f86de2cd2668b731b89a;hb=af3eba97fde00d6bc922df87732b3d28f717f120;hpb=edb485e0b93d0c6b82933708b309d1105bf8d63c

diff --git a/configure b/configure
index c07a49b0..20fbed62 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@ if [ "$srcdir" != "." ]; then
     cp -a "$srcdir"/test/* test
 
     # Emacs only likes to generate compiled files next to the .el files
-    # by default so copy these as well (which is not ideal0.
+    # by default so copy these as well (which is not ideal).
     cp -a "$srcdir"/emacs/*.el emacs
 fi
 
@@ -68,6 +68,7 @@ LIBDIR=
 WITH_DOCS=1
 WITH_EMACS=1
 WITH_BASH=1
+WITH_RUBY=1
 WITH_ZSH=1
 
 # Compatible GMime versions (with constraints).
@@ -99,7 +100,7 @@ First, some common variables can specified via environment variables:
 
 	CC		The C compiler to use
 	CFLAGS		Flags to pass to the C compiler
-        CPPFLAGS	Flags to pass to the C preprocessor
+	CPPFLAGS	Flags to pass to the C preprocessor
 	CXX		The C++ compiler to use
 	CXXFLAGS	Flags to pass to the C compiler
 	LDFLAGS		Flags to pass when linking
@@ -113,6 +114,8 @@ Other environment variables can be used to control configure itself,
 	XAPIAN_CONFIG	The program to use to determine flags for
 			compiling and linking against the Xapian
 			library. [$XAPIAN_CONFIG]
+	PYTHON		Name of python command to use in
+			configure and the test suite.
 
 Additionally, various options can be specified on the configure
 command line.
@@ -139,14 +142,15 @@ Fine tuning of some installation directories is available:
 
 Some specific library versions can be specified (auto-detected otherwise):
 
-        --with-gmime-version=VERS       Specify GMIME version (2.4 or 2.6)
+	--with-gmime-version=VERS       Specify GMIME version (2.4 or 2.6)
 
 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-emacs			Do not install lisp file
-	--without-bash-completion	Do not install bash completions files
+	--without-ruby			Do not install ruby bindings
 	--without-zsh-completion	Do not install zsh completions files
 
 Additional options are accepted for compatibility with other
@@ -187,6 +191,12 @@ for option; do
 	BASHCOMPLETIONDIR="${option#*=}"
     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
 	ZSHCOMLETIONDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--with-docs' ]; then
+	if [ "${option#*=}" = 'no' ]; then
+	    WITH_DOCS=0
+	else
+	    WITH_DOCS=1
+	fi
     elif [ "${option}" = '--without-docs' ] ; then
 	WITH_DOCS=0
     elif [ "${option%%=*}" = '--with-emacs' ]; then
@@ -205,6 +215,14 @@ for option; do
 	fi
     elif [ "${option}" = '--without-bash-completion' ] ; then
 	WITH_BASH=0
+    elif [ "${option%%=*}" = '--with-ruby' ]; then
+	if [ "${option#*=}" = 'no' ]; then
+	    WITH_RUBY=0
+	else
+	    WITH_RUBY=1
+	fi
+    elif [ "${option}" = '--without-ruby' ] ; then
+	WITH_RUBY=0
     elif [ "${option%%=*}" = '--with-zsh-completion' ]; then
 	if [ "${option#*=}" = 'no' ]; then
 	    WITH_ZSH=0
@@ -334,13 +352,13 @@ have_xapian_compact=0
 if [ ${have_xapian} = "1" ]; then
     printf "Checking for Xapian compaction support... "
     case "${xapian_version}" in
-        0.*|1.[01].*|1.2.[0-5])
-            printf "No (only available with Xapian > 1.2.6).\n" ;;
-        [1-9]*.[0-9]*.[0-9]*)
-            have_xapian_compact=1
-            printf "Yes.\n" ;;
-        *)
-            printf "Unknown version.\n" ;;
+	0.*|1.[01].*|1.2.[0-5])
+	    printf "No (only available with Xapian > 1.2.6).\n" ;;
+	[1-9]*.[0-9]*.[0-9]*)
+	    have_xapian_compact=1
+	    printf "Yes.\n" ;;
+	*)
+	    printf "Unknown version.\n" ;;
     esac
 fi
 
@@ -474,30 +492,32 @@ have_doxygen=0
 if [ $WITH_DOCS = "1" ] ; then
     printf "Checking if doxygen is available... "
     if command -v doxygen > /dev/null; then
-        printf "Yes.\n"
-        have_doxygen=1
+	printf "Yes.\n"
+	have_doxygen=1
     else
-        printf "No (so will not install api docs)\n"
+	printf "No (so will not install api docs)\n"
     fi
 fi
 
-printf "Checking for ruby development files... "
-if ruby -e "require 'mkmf'"> /dev/null 2>&1; then
-    printf "Yes.\n"
-    have_ruby_dev=1
-else
-    printf "No (skipping ruby bindings)\n"
-    have_ruby_dev=0
+have_ruby_dev=0
+if [ $WITH_RUBY = "1" ] ; then
+    printf "Checking for ruby development files... "
+    if ruby -e "require 'mkmf'"> /dev/null 2>&1; then
+	printf "Yes.\n"
+	have_ruby_dev=1
+    else
+	printf "No (skipping ruby bindings)\n"
+    fi
 fi
 
 have_sphinx=0
 if [ $WITH_DOCS = "1" ] ; then
     printf "Checking if sphinx is available and supports nroff output... "
     if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
-        printf "Yes.\n"
-        have_sphinx=1
+	printf "Yes.\n"
+	have_sphinx=1
     else
-        printf "No (so will not install man pages).\n"
+	printf "No (so will not install man pages).\n"
     fi
 fi