From 55384f8aefa5b0411d6bdb3e76d7e972a7ce785a Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 6 Dec 2015 20:10:15 +0200 Subject: [PATCH] Re: [PATCH] configure: drop use of "pkg-config emacs" --- 95/0a033c057e3c03821d3d932edc754a3c57f5e9 | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 95/0a033c057e3c03821d3d932edc754a3c57f5e9 diff --git a/95/0a033c057e3c03821d3d932edc754a3c57f5e9 b/95/0a033c057e3c03821d3d932edc754a3c57f5e9 new file mode 100644 index 000000000..4d85a70cf --- /dev/null +++ b/95/0a033c057e3c03821d3d932edc754a3c57f5e9 @@ -0,0 +1,102 @@ +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 D4A1D6DE13ED + for ; Sun, 6 Dec 2015 10:10:09 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.707 +X-Spam-Level: +X-Spam-Status: No, score=0.707 tagged_above=-999 required=5 tests=[AWL=0.055, + SPF_NEUTRAL=0.652] 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 5mqnPQahalFH for ; + Sun, 6 Dec 2015 10:10:07 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by arlo.cworth.org (Postfix) with ESMTP id ED8B86DE13DB + for ; Sun, 6 Dec 2015 10:10:06 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 8CAEE100046; + Sun, 6 Dec 2015 20:10:15 +0200 (EET) +From: Tomi Ollila +To: David Bremner , + Andrew Burgess , notmuch@notmuchmail.org +Subject: Re: [PATCH] configure: drop use of "pkg-config emacs" +In-Reply-To: <1449418220-17790-1-git-send-email-david@tethera.net> +References: + <1449418220-17790-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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, 06 Dec 2015 18:10:10 -0000 + +On Sun, Dec 06 2015, David Bremner wrote: + +> This does not play well with --prefix. As Tomi notes in +> id:m2k2p2rwth.fsf@guru.guru-group.fi, people still have the option of e.g. +> +> % ./configure ---emacslispdir=`pkg-config emacs --variable sitepkglispdir` +> --- +> oops, I missed a second use of pkg-config emacs + +LGTM. Patch applies. I cannot see how this could fail... + +Tomi + +> +> configure | 12 ++---------- +> 1 file changed, 2 insertions(+), 10 deletions(-) +> +> diff --git a/configure b/configure +> index 440d678..abd28da 100755 +> --- a/configure +> +++ b/configure +> @@ -472,19 +472,11 @@ else +> fi +> +> if [ -z "${EMACSLISPDIR}" ]; then +> - if pkg-config --exists emacs; then +> - EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir) +> - else +> - EMACSLISPDIR='$(prefix)/share/emacs/site-lisp' +> - fi +> + EMACSLISPDIR='$(prefix)/share/emacs/site-lisp' +> fi +> +> if [ -z "${EMACSETCDIR}" ]; then +> - if pkg-config --exists emacs; then +> - EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir) +> - else +> - EMACSETCDIR='$(prefix)/share/emacs/site-lisp' +> - fi +> + EMACSETCDIR='$(prefix)/share/emacs/site-lisp' +> fi +> +> printf "Checking if emacs is available... " +> -- +> 2.6.2 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> https://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2