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

diff --git a/c8/ee702a0b45799d8534153924b9d5f8b3292407 b/c8/ee702a0b45799d8534153924b9d5f8b3292407
new file mode 100644 (file)
index 0000000..36a4da4
--- /dev/null
+++ b/c8/ee702a0b45799d8534153924b9d5f8b3292407
@@ -0,0 +1,113 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 8DBCA6DE19A0\r
+ for <notmuch@notmuchmail.org>; Wed, 29 Jul 2015 23:20:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.16\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.16 tagged_above=-999 required=5 tests=[AWL=0.150,\r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id l86EKGRsxSqS for <notmuch@notmuchmail.org>;\r
+ Wed, 29 Jul 2015 23:20:46 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id D229B6DE1997\r
+ for <notmuch@notmuchmail.org>; Wed, 29 Jul 2015 23:20:45 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1ZKhCF-0004Xn-JK; Thu, 30 Jul 2015 06:20:03 +0000\r
+Received: (nullmailer pid 28691 invoked by uid 1000); Thu, 30 Jul 2015\r
+ 06:19:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] configure: support --without-ruby\r
+Date: Thu, 30 Jul 2015 08:19:22 +0200\r
+Message-Id: <1438237162-28454-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1438237162-28454-1-git-send-email-david@tethera.net>\r
+References: <1438237162-28454-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 30 Jul 2015 06:20:47 -0000\r
+\r
+Apparently some ruby installs are broken in ways that prevent the ruby\r
+bindings from building.\r
+---\r
+ configure | 26 +++++++++++++++++++-------\r
+ 1 file changed, 19 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index c415568..56f550b 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -68,6 +68,7 @@ LIBDIR=\r
+ WITH_DOCS=1\r
+ WITH_EMACS=1\r
+ WITH_BASH=1\r
++WITH_RUBY=1\r
+ WITH_ZSH=1\r
+ \r
+ # Compatible GMime versions (with constraints).\r
+@@ -147,6 +148,7 @@ Some features can be disabled (--with-feature=no is equivalent to\r
+       --without-bash-completion       Do not install bash completions files\r
+       --without-docs                  Do not install documentation and man pages\r
+       --without-emacs                 Do not install lisp file\r
++      --without-ruby                  Do not install ruby bindings\r
+       --without-zsh-completion        Do not install zsh completions files\r
+ \r
+ Additional options are accepted for compatibility with other\r
+@@ -211,6 +213,14 @@ for option; do\r
+       fi\r
+     elif [ "${option}" = '--without-bash-completion' ] ; then\r
+       WITH_BASH=0\r
++    elif [ "${option%%=*}" = '--with-ruby' ]; then\r
++      if [ "${option#*=}" = 'no' ]; then\r
++          WITH_RUBY=0\r
++      else\r
++          WITH_RUBY=1\r
++      fi\r
++    elif [ "${option}" = '--without-ruby' ] ; then\r
++      WITH_RUBY=0\r
+     elif [ "${option%%=*}" = '--with-zsh-completion' ]; then\r
+       if [ "${option#*=}" = 'no' ]; then\r
+           WITH_ZSH=0\r
+@@ -487,13 +497,15 @@ if [ $WITH_DOCS = "1" ] ; then\r
+     fi\r
+ fi\r
+ \r
+-printf "Checking for ruby development files... "\r
+-if ruby -e "require 'mkmf'"> /dev/null 2>&1; then\r
+-    printf "Yes.\n"\r
+-    have_ruby_dev=1\r
+-else\r
+-    printf "No (skipping ruby bindings)\n"\r
+-    have_ruby_dev=0\r
++have_ruby_dev=0\r
++if [ $WITH_RUBY = "1" ] ; then\r
++    printf "Checking for ruby development files... "\r
++    if ruby -e "require 'mkmf'"> /dev/null 2>&1; then\r
++      printf "Yes.\n"\r
++      have_ruby_dev=1\r
++    else\r
++      printf "No (skipping ruby bindings)\n"\r
++    fi\r
+ fi\r
+ \r
+ have_sphinx=0\r
+-- \r
+2.1.4\r
+\r