[PATCH 2/2] Use autotools config.sub for --host and --build parsing

diff --git a/06/5aa240ce3acb702d226ada87ef84065c0af3ec b/06/5aa240ce3acb702d226ada87ef84065c0af3ec
new file mode 100644 (file)
index 0000000..b62d4d5
--- /dev/null
+++ b/06/5aa240ce3acb702d226ada87ef84065c0af3ec
@@ -0,0 +1,129 @@
+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 C012D431FC4\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 08:40:41 -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 5qGOjXPJrv1p for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Mar 2012 08:40:40 -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 4A86A431FDE\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 08:40:39 -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 F1B5F41822D\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 17:40:37 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 71CCEDF2A3; Sat,  3 Mar 2012 17:40:37 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [85.183.11.228])\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 A3134DF2A2;\r
+       Sat,  3 Mar 2012 17:40:31 +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 1S3s0U-0007XB-Lv; Sat, 03 Mar 2012 17:40:30 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] Use autotools config.sub for --host and --build parsing\r
+Date: Sat,  3 Mar 2012 17:40:23 +0100\r
+Message-Id:\r
+ <1330792823-6049-3-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To:\r
+ <1330792823-6049-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1330792823-6049-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: Sat, 03 Mar 2012 16:40:42 -0000\r
+\r
+This introduces a build dependency on autotools, update debian/control\r
+accordingly.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ configure      |   28 ++++++----------------------\r
+ debian/control |    1 +\r
+ 2 files changed, 7 insertions(+), 22 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 77203ed..182bd12 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -171,33 +171,17 @@ 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
++      if ! build_option="`/usr/share/misc/config.sub "${option#*=}"`" ; then\r
++          exit 1\r
++      fi\r
+       build_cpu=${build_option%%-*}\r
+       build_option=${build_option#*-}\r
+       build_vendor=${build_option%%-*}\r
+       build_os=${build_option#*-}\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
++      if ! host_option="`/usr/share/misc/config.sub "${option#*=}"`" ; then\r
++          exit 1\r
++      fi\r
+       host_cpu=${host_option%%-*}\r
+       host_option=${host_option#*-}\r
+       host_vendor=${host_option%%-*}\r
+diff --git a/debian/control b/debian/control\r
+index b60790e..bfb5f01 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -8,6 +8,7 @@ Uploaders:\r
+  David Bremner <bremner@debian.org>\r
+ Build-Depends:\r
+  debhelper (>= 7.0.50~),\r
++ autotools-dev,\r
+  pkg-config,\r
+  libxapian-dev,\r
+  libgmime-2.6-dev | libgmime-2.4-dev,\r
+-- \r
+1.7.9.1\r
+\r