From 70e2c2c731934b41029d7c3f11a13e297a2147d6 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 14 Mar 2012 16:59:59 +0200 Subject: [PATCH] [PATCH 1/2] configure: store $IFS to $DEFAULT_IFS readonly variable --- 79/1c92d9fd7b8ebd376f401ce4423a45025e4c3c | 93 +++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 79/1c92d9fd7b8ebd376f401ce4423a45025e4c3c diff --git a/79/1c92d9fd7b8ebd376f401ce4423a45025e4c3c b/79/1c92d9fd7b8ebd376f401ce4423a45025e4c3c new file mode 100644 index 000000000..a10655f3e --- /dev/null +++ b/79/1c92d9fd7b8ebd376f401ce4423a45025e4c3c @@ -0,0 +1,93 @@ +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 AD455431FC0 + for ; Wed, 14 Mar 2012 08:00:09 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 Jz5xoAiw5TcN for ; + Wed, 14 Mar 2012 08:00:07 -0700 (PDT) +Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) + by olra.theworths.org (Postfix) with ESMTP id 9AF69431FBC + for ; Wed, 14 Mar 2012 08:00:07 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 4257068055; Wed, 14 Mar 2012 17:00:06 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] configure: store $IFS to $DEFAULT_IFS readonly variable +Date: Wed, 14 Mar 2012 16:59:59 +0200 +Message-Id: <1331737200-16570-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.6.1 +In-Reply-To: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net> +References: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net> +Cc: Tomi Ollila +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: Wed, 14 Mar 2012 15:00:10 -0000 + +In the future, IFS value needs to be changed in a few places +in configure -- and then restored. Store the original value +to $DEFAULT_IFS for easy restoration. +--- + configure | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index ee0ae73..3b2b6b7 100755 +--- a/configure ++++ b/configure +@@ -1,5 +1,8 @@ + #! /bin/sh + ++# Store original IFS value so it can be changed (and restored) in many places. ++readonly DEFAULT_IFS=$IFS ++ + srcdir=$(dirname "$0") + + # For a non-srcdir configure invocation (such as ../configure), create +@@ -379,7 +382,6 @@ elif [ $uname = "Linux" ] ; then + # IFS=$(printf '\n') + # + # because the shell's command substitution deletes any trailing newlines. +- OLD_IFS=$IFS + IFS=" + " + for path in $ldconfig_paths; do +@@ -387,7 +389,7 @@ elif [ $uname = "Linux" ] ; then + libdir_in_ldconfig=1 + fi + done +- IFS=$OLD_IFS ++ IFS=$DEFAULT_IFS + if [ "$libdir_in_ldconfig" = '0' ]; then + printf "No (will set RPATH)\n" + else +@@ -536,7 +538,7 @@ done + printf "\n\t${WARN_CFLAGS}\n" + + rm -f minimal minimal.c +- ++ + cat <