test: use the python interpreter in sh.config

[notmuch] / configure

diff --git a/configure b/configure
index 04761aab611cb5c5ac164d291826497a25852229..20fbed620e14883651091a473805ca21edbf24db 100755 (executable)
--- 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).
@@ -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