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