updates for configure options

updates for configure options

[David Bremner]

These are only roughly thematicly connected.

1) A fixup for the new --without-docs option
2) Add an option to disable building the ruby bindings.

[PATCH 1/3] configure: alphabetize --without help

[David Bremner]

Now that the "without" options seem to be multiplying, try to make it
easier for people to find the one they want.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b8b2c67..1e17b46 100755
--- a/configure
+++ b/configure
@@ -144,9 +144,9 @@ 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-zsh-completion	Do not install zsh completions files
 
 Additional options are accepted for compatibility with other
-- 
2.1.4

[PATCH 2/3] configure: support --with-docs=no

[David Bremner]

Since we promise --with-foo=no is equivalent to --without-foo
---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index 1e17b46..c415568 100755
--- a/configure
+++ b/configure
@@ -187,6 +187,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
-- 
2.1.4

[PATCH 3/3] configure: support --without-ruby

[David Bremner]

Apparently some ruby installs are broken in ways that prevent the ruby
bindings from building.
---
 configure | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index c415568..56f550b 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).
@@ -147,6 +148,7 @@ Some features can be disabled (--with-feature=no is equivalent to
 	--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-ruby			Do not install ruby bindings
 	--without-zsh-completion	Do not install zsh completions files
 
 Additional options are accepted for compatibility with other
@@ -211,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
@@ -487,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
-- 
2.1.4

Re: updates for configure options

[Tomi Ollila]

On Thu, Jul 30 2015, David Bremner <david@tethera.net> wrote:

> These are only roughly thematicly connected.
>
> 1) A fixup for the new --without-docs option
> 2) Add an option to disable building the ruby bindings.

Series LGTM. ./configure w/ all alternatives seems to work OK.


Tomi

Re: updates for configure options

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:
>
> Series LGTM. ./configure w/ all alternatives seems to work OK.
>

I pushed the series.

Suvayu, you might be interested because there is now a configure option
to disable building the ruby bindings.

d