X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=20fbed620e14883651091a473805ca21edbf24db;hp=b8b2c67bab4c01b7acb155139add4fb3c38043c3;hb=23d86773b9e1b8111921af94f7f14ea0867eaee2;hpb=b4e0c8320a5d7461b859832fc3074c2ea6fc9f6d

diff --git a/configure b/configure
index b8b2c67b..20fbed62 100755
--- a/configure
+++ b/configure
@@ -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).
@@ -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.
@@ -144,9 +147,10 @@ Some specific library versions can be specified (auto-detected otherwise):
 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
@@ -481,13 +499,15 @@ if [ $WITH_DOCS = "1" ] ; then
     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