From 64d6d1270c216878d11f0ccc22c76fb09234de7d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 30 Jul 2015 08:19:22 +0200 Subject: [PATCH] [PATCH 3/3] configure: support --without-ruby --- c8/ee702a0b45799d8534153924b9d5f8b3292407 | 113 ++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 c8/ee702a0b45799d8534153924b9d5f8b3292407 diff --git a/c8/ee702a0b45799d8534153924b9d5f8b3292407 b/c8/ee702a0b45799d8534153924b9d5f8b3292407 new file mode 100644 index 000000000..36a4da4d2 --- /dev/null +++ b/c8/ee702a0b45799d8534153924b9d5f8b3292407 @@ -0,0 +1,113 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 8DBCA6DE19A0 + for ; Wed, 29 Jul 2015 23:20:47 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.16 +X-Spam-Level: +X-Spam-Status: No, score=0.16 tagged_above=-999 required=5 tests=[AWL=0.150, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id l86EKGRsxSqS for ; + Wed, 29 Jul 2015 23:20:46 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id D229B6DE1997 + for ; Wed, 29 Jul 2015 23:20:45 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZKhCF-0004Xn-JK; Thu, 30 Jul 2015 06:20:03 +0000 +Received: (nullmailer pid 28691 invoked by uid 1000); Thu, 30 Jul 2015 + 06:19:48 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 3/3] configure: support --without-ruby +Date: Thu, 30 Jul 2015 08:19:22 +0200 +Message-Id: <1438237162-28454-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1438237162-28454-1-git-send-email-david@tethera.net> +References: <1438237162-28454-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 30 Jul 2015 06:20:47 -0000 + +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 + -- 2.26.2