From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SCaSCfr2YWF8KwAAgWs5BA (envelope-from ) for ; Sat, 09 Oct 2021 22:09:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EAlwA/r2YWGyAwAAB5/wlQ (envelope-from ) for ; Sat, 09 Oct 2021 20:09:30 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 CAF8D1A927 for ; Sat, 9 Oct 2021 22:09:28 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 9FD8826E90; Sat, 9 Oct 2021 16:09:23 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D3EFC26E74 for ; Sat, 9 Oct 2021 16:09:20 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 771885FD5C; Sat, 9 Oct 2021 16:09:20 -0400 (EDT) Received: (nullmailer pid 1121673 invoked by uid 1000); Sat, 09 Oct 2021 20:09:19 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH] configure: whitespace cleanup Date: Sat, 9 Oct 2021 17:09:16 -0300 Message-Id: <20211009200916.1121658-1-david@tethera.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Message-ID-Hash: IR2HP3AXUWHLK4WZRLDEYYAJNTHNTJ66 X-Message-ID-Hash: IR2HP3AXUWHLK4WZRLDEYYAJNTHNTJ66 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; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633810169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7mMw/Et4XATYY+92qMiJ35lmhC+Bo48/ViIvjKiA4Qw=; b=pnN1G48SovPaoNzDSsTvNLHwXhyzwha0ktslDdIxhdc0Ct4Bj3iXP+qCGpIWWp4C0ga3Qw kEizF8jCTbtCmL3apevOR+OWqYPrwFrl890jSSkbFhuJu2c/YIaEEo+D4OzxDobqULgpFH SXKghU+e/NQBY3Jam45y/BiE7sjse+1F/Bvt+5p8Z40/SX0/T1JlH1a+7cvr8MG53ytxLa kmeeXkzgblesrM41rlp5o9q092ugOeTEURgwbDAPYC0cfNgLryTBPj1owJzpJK8f9PXlGA Ddz0EerlUwMt7vWGbD2WAWmzeh3xl1gehIVOUkKC2VrylY37ZzulJONAPsZkSA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633810169; a=rsa-sha256; cv=none; b=fhzyqMR/W+VP52xR7M74hOKxvEeAXC0LL6CpuWcQWhyBcwmnzbLUbjyKw/LOQHCVD/dP9U kQY1CyzefxO56jDN7TzFW4RwyVw/5x1h6/DFwKbmUZrL7sVgrY6XCtcBOZrfi7VOsc5RTU +WEsR/pEHe/GzJYijNG81uyn/aD94qcfQhZbYQd1pgIYwvE+pOlRJgTjZQdxTmSjb8Ldkz rpRgzw3mAumwo4IDROIMzKvarIDU7sN/819aAI8+L9PYVWPDxx6o0A5xwObW2sgh01DsGi ZRXZZc8EsyoOe3W9sy71sUVVavi4kuDrfgn91jIBX48TIVTvmnzrIB4Qx0zvYg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.00 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: CAF8D1A927 X-Spam-Score: -1.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: Wc/k/n5iHvrd In order to make it easier to keep the whitespace consistent in the configure script, use the same style defined in devel/STYLE for C/C++. Specifically, a line should begin with zero or more tabs followed by fewer than eight spaces. Presumably this will be no more difficult for people editing configure than for people editing the C and C++ code. --- configure | 136 +++++++++++++++++++++++++++--------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/configure b/configure index e2d40d11..6c3a38f1 100755 --- a/configure +++ b/configure @@ -496,16 +496,16 @@ int main () { } EOF if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then - printf 'No.\nCould not make tempdir for testing session-key support.\n' - errors=$((errors + 1)) + printf 'No.\nCould not make tempdir for testing session-key support.\n' + errors=$((errors + 1)) elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ - && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ - && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ - && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] + && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ + && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ + && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] then - printf "OK.\n" + printf "OK.\n" else - cat </dev/null; then - printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" - else - printf 'You do not have the GPGME development libraries installed.\n' - fi - errors=$((errors + 1)) + if command -v gpgme-config >/dev/null; then + printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" + else + printf 'You do not have the GPGME development libraries installed.\n' + fi + errors=$((errors + 1)) fi if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then - rm -rf "$TEMP_GPG" + rm -rf "$TEMP_GPG" fi # see https://github.com/jstedfast/gmime/pull/90 @@ -570,36 +570,36 @@ int main () { } EOF if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then - printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' - errors=$((errors + 1)) + printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' + errors=$((errors + 1)) elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \ - && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ - && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ - && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt + && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ + && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ + && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt then - if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then - gmime_x509_cert_validity=1 - printf "Yes.\n" - else - gmime_x509_cert_validity=0 - printf "No.\n" - if pkg-config --exists "gmime-3.0 >= 3.2.7"; then - cat <= 3.2.7"; then + cat <= 3.5)..." if "$python" -c 'import sys, sysconfig; assert sys.version_info >= (3,5)'; >/dev/null 2>&1; then - printf "Yes.\n" - have_python3=1 + printf "Yes.\n" + have_python3=1 else - printf "No (will not install CFFI-based python bindings).\n" + printf "No (will not install CFFI-based python bindings).\n" fi fi @@ -783,11 +783,11 @@ if [ $have_python3 -eq 1 ]; then printf "Checking for python $python3_version development files..." if pkg-config --exists "python-$python3_version"; then - have_python3_dev=1 - printf "Yes.\n" + have_python3_dev=1 + printf "Yes.\n" else - have_python3_dev=0 - printf "No (will not install CFFI-based python bindings).\n" + have_python3_dev=0 + printf "No (will not install CFFI-based python bindings).\n" fi fi @@ -796,12 +796,12 @@ have_python3_pytest=0 if [ $have_python3_dev -eq 1 ]; then printf "Checking for python3 cffi and setuptools... " if "$python" -c 'import cffi,setuptools; cffi.FFI().verify()' >/dev/null 2>&1; then - printf "Yes.\n" - have_python3_cffi=1 - WITH_PYTHON_DOCS=1 + printf "Yes.\n" + have_python3_cffi=1 + WITH_PYTHON_DOCS=1 else - WITH_PYTHON_DOCS=0 - printf "No (will not install CFFI-based python bindings).\n" + WITH_PYTHON_DOCS=0 + printf "No (will not install CFFI-based python bindings).\n" fi rm -rf __pycache__ # cffi.FFI().verify() uses this space @@ -809,10 +809,10 @@ if [ $have_python3_dev -eq 1 ]; then conf=$(mktemp) printf "[pytest]\nminversion=3.0\n" > $conf if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then - printf "Yes.\n" - have_python3_pytest=1 + printf "Yes.\n" + have_python3_pytest=1 else - printf "No (will not test CFFI-based python bindings).\n" + printf "No (will not test CFFI-based python bindings).\n" fi rm -f $conf fi @@ -860,10 +860,10 @@ fi if [ $WITH_EMACS = "1" ]; then printf "Checking if emacs (>= 25) is available... " if emacs --quick --batch --eval '(if (< emacs-major-version 25) (kill-emacs 1))' > /dev/null 2>&1; then - printf "Yes.\n" + printf "Yes.\n" else - printf "No (disabling emacs related parts of build)\n" - WITH_EMACS=0 + printf "No (disabling emacs related parts of build)\n" + WITH_EMACS=0 fi fi @@ -1571,10 +1571,10 @@ EOF { echo "# Generated by configure, run from doc/conf.py" if [ $WITH_EMACS = "1" ]; then - echo "tags.add('WITH_EMACS')" + echo "tags.add('WITH_EMACS')" fi if [ $WITH_PYTHON_DOCS = "1" ]; then - echo "tags.add('WITH_PYTHON')" + echo "tags.add('WITH_PYTHON')" fi printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)" } > sphinx.config -- 2.33.0