[PATCH] configure: only install bash completion if supported
authorJani Nikula <jani@nikula.org>
Sun, 2 Feb 2014 16:47:57 +0000 (18:47 +0200)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:59:32 +0000 (09:59 -0800)
90/827be3dd36655b88cd84cca2f5134bd8ebd4ae [new file with mode: 0644]

diff --git a/90/827be3dd36655b88cd84cca2f5134bd8ebd4ae b/90/827be3dd36655b88cd84cca2f5134bd8ebd4ae
new file mode 100644 (file)
index 0000000..969b826
--- /dev/null
@@ -0,0 +1,91 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id F21A4431FBD\r
+       for <notmuch@notmuchmail.org>; Sun,  2 Feb 2014 08:48:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id T2gSZY7Lvhiy for <notmuch@notmuchmail.org>;\r
+       Sun,  2 Feb 2014 08:48:02 -0800 (PST)\r
+Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com\r
+ [74.125.83.48])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 6B27C431FBF   for <notmuch@notmuchmail.org>; Sun,  2 Feb 2014 08:48:02 -0800\r
+ (PST)\r
+Received: by mail-ee0-f48.google.com with SMTP id t10so3164942eei.7\r
+       for <notmuch@notmuchmail.org>; Sun, 02 Feb 2014 08:48:00 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=wymaizHcI3gKKWj1NgAJqK4R0+/kLkjqr8uneAeUgsQ=;\r
+       b=BUqmdKtpGjEbfd/ocmeFk/fHdy1RVOHzThZVcnwuiKRlX9fmuTj4cDuNbdXkWAvLwS\r
+       NX7clhC5Aufk6sl18kdIwT6oku0ky6euhTlTOKy9KL80YjtCiRDIU3Oxyqnb75AS01oH\r
+       jxDZ9iLH4gvX9KoGyyjQhcHMNbFpi/28lci/SKua4EV5WWv2mWUptB1gV1ZI5en70cqQ\r
+       YB9dEYt0dlOLMnR5rsZIMHwmiXfXyYYxFLqtJ70pX/bfSjt716Qrg87jXdXYg7/8BLt0\r
+       t+jO96X2xhe4dCZFatKYlntNsZhxafHV/12UA2XkKOl29gO28EqiONwBz74QHe9+GGuo\r
+       oMQg==\r
+X-Gm-Message-State:\r
+ ALoCoQkOAF66w4nbe3F2MLEzeIf2WbJ0fPr0BdzJ6nmrnBww+7HyfhLt2a2RsdNV3yiUHGPy2Leu\r
+X-Received: by 10.15.67.197 with SMTP id u45mr8606445eex.24.1391359679856;\r
+       Sun, 02 Feb 2014 08:47:59 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id m9sm50518575eeh.3.2014.02.02.08.47.58\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 02 Feb 2014 08:47:58 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] configure: only install bash completion if supported\r
+Date: Sun,  2 Feb 2014 18:47:57 +0200\r
+Message-Id: <1391359677-12497-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.2\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Sun, 02 Feb 2014 16:48:07 -0000\r
+\r
+Our bash completion depends on bash-completion 1.90 or later. Only\r
+install where available.\r
+---\r
+ configure | 8 ++++++++\r
+ 1 file changed, 8 insertions(+)\r
+\r
+diff --git a/configure b/configure\r
+index 13b6062..66aaedb 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -360,6 +360,14 @@ else\r
+     have_valgrind=0\r
+ fi\r
\r
++printf "Checking for bash-completion (>= 1.90)... "\r
++if pkg-config --atleast-version=1.90 bash-completion; then\r
++    printf "Yes.\n"\r
++else\r
++    printf "No (will not install bash completion).\n"\r
++    WITH_BASH=0\r
++fi\r
++\r
+ if [ -z "${EMACSLISPDIR}" ]; then\r
+     if pkg-config --exists emacs; then\r
+       EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)\r
+-- \r
+1.8.5.2\r
+\r