[PATCH 2/2] Do not try to parse the options for --build and --host arguments

diff --git a/16/0b153e1eeddba0449940d0410c75f4bb2ae53b b/16/0b153e1eeddba0449940d0410c75f4bb2ae53b
new file mode 100644 (file)
index 0000000..04a5d0c
--- /dev/null
+++ b/16/0b153e1eeddba0449940d0410c75f4bb2ae53b
@@ -0,0 +1,120 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 603EF431FC3\r
+       for <notmuch@notmuchmail.org>; Mon,  5 Mar 2012 02:23:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Sk1SXw5IE5Gr for <notmuch@notmuchmail.org>;\r
+       Mon,  5 Mar 2012 02:23:57 -0800 (PST)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B00F3431FBC\r
+       for <notmuch@notmuchmail.org>; Mon,  5 Mar 2012 02:23:57 -0800 (PST)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 84A22542632\r
+       for <notmuch@notmuchmail.org>; Mon,  5 Mar 2012 11:23:56 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 06DBEDF2A3; Mon,  5 Mar 2012 11:23:56 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [193.174.12.196])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id B9A5ADF2A1;\r
+       Mon,  5 Mar 2012 11:23:50 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1S4V53-0002mr-BC; Mon, 05 Mar 2012 11:23:49 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] Do not try to parse the options for --build and --host\r
+       arguments\r
+Date: Mon,  5 Mar 2012 11:23:44 +0100\r
+Message-Id:\r
+ <1330943024-10541-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To:\r
+ <1330943024-10541-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References: <87k42zokjs.fsf@zancas.localnet>\r
+       <1330943024-10541-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 05 Mar 2012 10:23:59 -0000\r
+\r
+Formerly the code assumed the arguments to be triples and threw an\r
+error if this was not the case. But those arguments are only there for\r
+compatibility with autotools and are not used within the build system,\r
+so just dropping the code parsing these values makes the build system\r
+more robust.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ configure |   32 ++------------------------------\r
+ 1 files changed, 2 insertions(+), 30 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 77203ed..ca30482 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -171,37 +171,9 @@ for option; do\r
+     elif [ "${option}" = '--without-zsh-completion' ] ; then\r
+       WITH_ZSH=0\r
+     elif [ "${option%%=*}" = '--build' ] ; then\r
+-      build_option="${option#*=}"\r
+-      case ${build_option} in\r
+-          *-*-*) ;;\r
+-          *)\r
+-              echo "Unrecognized value for --build option: ${build_option}"\r
+-              echo "Should be: <cpu>-<vendor>-<os>"\r
+-              echo "See:"\r
+-              echo "  $0 --help"\r
+-              echo ""\r
+-              exit 1\r
+-      esac\r
+-      build_cpu=${build_option%%-*}\r
+-      build_option=${build_option#*-}\r
+-      build_vendor=${build_option%%-*}\r
+-      build_os=${build_option#*-}\r
++      true\r
+     elif [ "${option%%=*}" = '--host' ] ; then\r
+-      host_option="${option#*=}"\r
+-      case ${host_option} in\r
+-          *-*-*) ;;\r
+-          *)\r
+-              echo "Unrecognized value for --host option: ${host_option}"\r
+-              echo "Should be: <cpu>-<vendor>-<os>"\r
+-              echo "See:"\r
+-              echo "  $0 --help"\r
+-              echo ""\r
+-              exit 1\r
+-      esac\r
+-      host_cpu=${host_option%%-*}\r
+-      host_option=${host_option#*-}\r
+-      host_vendor=${host_option%%-*}\r
+-      host_os=${host_option#*-}\r
++      true\r
+     elif [ "${option%%=*}" = '--infodir' ] ; then\r
+       true\r
+     elif [ "${option%%=*}" = '--datadir' ] ; then\r
+-- \r
+1.7.9.1\r
+\r