From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kDwOJdTVw2F2EwEAgWs5BA (envelope-from ) for ; Thu, 23 Dec 2021 02:50:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4DnKINTVw2HkBwAAbx9fmQ (envelope-from ) for ; Thu, 23 Dec 2021 01:50:12 +0000 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5B59A13AE3 for ; Thu, 23 Dec 2021 02:50:12 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A1E915F708; Thu, 23 Dec 2021 01:50:08 +0000 (UTC) X-Greylist: delayed 312 seconds by postgrey-1.36 at yantan; Thu, 23 Dec 2021 01:50:05 UTC Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id B95C15F401 for ; Thu, 23 Dec 2021 01:50:05 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 33A005FC42; Wed, 22 Dec 2021 20:44:53 -0500 (EST) Received: (nullmailer pid 1418800 invoked by uid 1000); Thu, 23 Dec 2021 01:44:52 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config Date: Wed, 22 Dec 2021 21:44:45 -0400 Message-Id: <20211223014445.1418772-1-david@tethera.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Message-ID-Hash: ISKWDZHZPJ4LUQ7B2BKFXSZRSI7YPIDQ X-Message-ID-Hash: ISKWDZHZPJ4LUQ7B2BKFXSZRSI7YPIDQ X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640224212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=BJvqOw/sm30mmGueHF5kSPC5YxLRagU2xgglWj/wy4M=; b=lw4I6RjzzE4xyxYAPAcUfR7Be+Br0UBEbdjpA8JuB1nRgv7IYYMiOpBsfKhweX37O/pi1k ywgmpxdQo+DfAx/4RxkF/bZQNtfpdI9a3DiF4hOjRxApLcCgynS+ptUuIencJ6O7C3sx8a uRsdwyXtaEdPu5T7EsHgb5Dot8eT/wZCqcK4PEFlNLOSy74hsQ3niukP3ewEseUB7F08cj Qs664t2Wlp8Hj7VSay4KCAHLHco3H2a21lN/9Ia9LwPDmjg15dKjWkW22af9cbuKj1UkF6 xReuoWSsMF0dQ8cxoyOLO7MHM1X/xsyVHPxtwrOuvsEGIRGeAvrsWpZVPNeAsg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640224212; a=rsa-sha256; cv=none; b=YJBGWcQ8aKR4k5orjZhb599gxIDGZmVKzCGyZvf2IdHi9w1r3FPj8pGVpFx8CTIKfH0mpA 3fZNVumUDguP+emC1nn8N1c9qfT3geI5P9YZNkE8jONh08qzha2lHNYR7OhoVrnpK7dPhm TfruATf7iUPD0d6FwQGCO0YJC/KrV82s80Di9o2tT7mwZ7eCEmixAo8dMuWt59LfXTIlWP 5lO4Nl0NUomF/h17zeHGSpvf1SYSpR6woFpItQuWDgEE7ARHUJWlHk0HWktPf1UOWv3OJ7 0No04r0LGU0V5jeRCuoFs6joMRgn+q3U5+a1jBbo82WXVc8xg7d+CKaSDcyo4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.66 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 5B59A13AE3 X-Spam-Score: -1.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: QGq6iS06C1b7 This will correct the current use of an undefined variable when setting LD_LIBRARY_PATH in doc/Makefile.local It is tempting to try to replace the use of test/export-dirs.sh, but this is not as simple as it looks, as NOTMUCH_BUILDDIR is used to locate sh.config, so probably cannot also sensibly be used to define it. --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index d399457a..e7bb7edc 100755 --- a/configure +++ b/configure @@ -55,6 +55,8 @@ subdirs="${subdirs} bindings" # the directory structure and copy Makefiles. if [ "$srcdir" != "." ]; then + NOTMUCH_BUILDDIR=$PWD + for dir in . ${subdirs}; do mkdir -p "$dir" cp "$srcdir"/"$dir"/Makefile.local "$dir" @@ -78,6 +80,8 @@ if [ "$srcdir" != "." ]; then "$srcdir"/bindings/python-cffi/notmuch2 \ "$srcdir"/bindings/python-cffi/setup.py \ bindings/python-cffi/ +else + NOTMUCH_BUILDDIR=$NOTMUCH_SRCDIR fi # Set several defaults (optionally specified by the user in @@ -1247,6 +1251,7 @@ cat > Makefile.config <