X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=56f550b055c5854d2588c8a36e84ddc2eb6e935c;hp=04761aab611cb5c5ac164d291826497a25852229;hb=2eb558fd9b369458c23b57b44281758bd17a5580;hpb=1fef811fd78baf5b1e06d1cdabe3fea579726fe7

diff --git a/configure b/configure
index 04761aab..56f550b0 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).
@@ -144,9 +145,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 +189,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 +213,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 +497,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