c8/ee702a0b45799d8534153924b9d5f8b3292407

   1 Return-Path: <bremner@tesseract.cs.unb.ca>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5  by arlo.cworth.org (Postfix) with ESMTP id 8DBCA6DE19A0\r
   6  for <notmuch@notmuchmail.org>; Wed, 29 Jul 2015 23:20:47 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at cworth.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.16\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.16 tagged_above=-999 required=5 tests=[AWL=0.150,\r
  12  T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
  13 Received: from arlo.cworth.org ([127.0.0.1])\r
  14  by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15  with ESMTP id l86EKGRsxSqS for <notmuch@notmuchmail.org>;\r
  16  Wed, 29 Jul 2015 23:20:46 -0700 (PDT)\r
  17 Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
  18  by arlo.cworth.org (Postfix) with ESMTPS id D229B6DE1997\r
  19  for <notmuch@notmuchmail.org>; Wed, 29 Jul 2015 23:20:45 -0700 (PDT)\r
  20 Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
  21  (envelope-from <bremner@tesseract.cs.unb.ca>)\r
  22  id 1ZKhCF-0004Xn-JK; Thu, 30 Jul 2015 06:20:03 +0000\r
  23 Received: (nullmailer pid 28691 invoked by uid 1000); Thu, 30 Jul 2015\r
  24  06:19:48 -0000\r
  25 From: David Bremner <david@tethera.net>\r
  26 To: notmuch@notmuchmail.org\r
  27 Subject: [PATCH 3/3] configure: support --without-ruby\r
  28 Date: Thu, 30 Jul 2015 08:19:22 +0200\r
  29 Message-Id: <1438237162-28454-4-git-send-email-david@tethera.net>\r
  30 X-Mailer: git-send-email 2.1.4\r
  31 In-Reply-To: <1438237162-28454-1-git-send-email-david@tethera.net>\r
  32 References: <1438237162-28454-1-git-send-email-david@tethera.net>\r
  33 X-BeenThere: notmuch@notmuchmail.org\r
  34 X-Mailman-Version: 2.1.18\r
  35 Precedence: list\r
  36 List-Id: "Use and development of the notmuch mail system."\r
  37  <notmuch.notmuchmail.org>\r
  38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  39  <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  40 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
  41 List-Post: <mailto:notmuch@notmuchmail.org>\r
  42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  44  <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  45 X-List-Received-Date: Thu, 30 Jul 2015 06:20:47 -0000\r
  46 \r
  47 Apparently some ruby installs are broken in ways that prevent the ruby\r
  48 bindings from building.\r
  49 ---\r
  50  configure | 26 +++++++++++++++++++-------\r
  51  1 file changed, 19 insertions(+), 7 deletions(-)\r
  52 \r
  53 diff --git a/configure b/configure\r
  54 index c415568..56f550b 100755\r
  55 --- a/configure\r
  56 +++ b/configure\r
  57 @@ -68,6 +68,7 @@ LIBDIR=\r
  58  WITH_DOCS=1\r
  59  WITH_EMACS=1\r
  60  WITH_BASH=1\r
  61 +WITH_RUBY=1\r
  62  WITH_ZSH=1\r
  63  \r
  64  # Compatible GMime versions (with constraints).\r
  65 @@ -147,6 +148,7 @@ Some features can be disabled (--with-feature=no is equivalent to\r
  66         --without-bash-completion       Do not install bash completions files\r
  67         --without-docs                  Do not install documentation and man pages\r
  68         --without-emacs                 Do not install lisp file\r
  69 +       --without-ruby                  Do not install ruby bindings\r
  70         --without-zsh-completion        Do not install zsh completions files\r
  71  \r
  72  Additional options are accepted for compatibility with other\r
  73 @@ -211,6 +213,14 @@ for option; do\r
  74         fi\r
  75      elif [ "${option}" = '--without-bash-completion' ] ; then\r
  76         WITH_BASH=0\r
  77 +    elif [ "${option%%=*}" = '--with-ruby' ]; then\r
  78 +       if [ "${option#*=}" = 'no' ]; then\r
  79 +           WITH_RUBY=0\r
  80 +       else\r
  81 +           WITH_RUBY=1\r
  82 +       fi\r
  83 +    elif [ "${option}" = '--without-ruby' ] ; then\r
  84 +       WITH_RUBY=0\r
  85      elif [ "${option%%=*}" = '--with-zsh-completion' ]; then\r
  86         if [ "${option#*=}" = 'no' ]; then\r
  87             WITH_ZSH=0\r
  88 @@ -487,13 +497,15 @@ if [ $WITH_DOCS = "1" ] ; then\r
  89      fi\r
  90  fi\r
  91  \r
  92 -printf "Checking for ruby development files... "\r
  93 -if ruby -e "require 'mkmf'"> /dev/null 2>&1; then\r
  94 -    printf "Yes.\n"\r
  95 -    have_ruby_dev=1\r
  96 -else\r
  97 -    printf "No (skipping ruby bindings)\n"\r
  98 -    have_ruby_dev=0\r
  99 +have_ruby_dev=0\r
 100 +if [ $WITH_RUBY = "1" ] ; then\r
 101 +    printf "Checking for ruby development files... "\r
 102 +    if ruby -e "require 'mkmf'"> /dev/null 2>&1; then\r
 103 +       printf "Yes.\n"\r
 104 +       have_ruby_dev=1\r
 105 +    else\r
 106 +       printf "No (skipping ruby bindings)\n"\r
 107 +    fi\r
 108  fi\r
 109  \r
 110  have_sphinx=0\r
 111 -- \r
 112 2.1.4\r
 113 \r