Return-Path: <teythoon@jade-hamburg.de>
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 C012D431FC4
	for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 08:40:41 -0800 (PST)
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 5qGOjXPJrv1p for <notmuch@notmuchmail.org>;
	Sat,  3 Mar 2012 08:40:40 -0800 (PST)
Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 4A86A431FDE
	for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 08:40:39 -0800 (PST)
Received: from mail.jade-hamburg.de (unknown [85.183.11.228])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.cryptobitch.de (Postfix) with ESMTPSA id F1B5F41822D
	for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 17:40:37 +0100 (CET)
Received: by mail.jade-hamburg.de (Postfix, from userid 401)
	id 71CCEDF2A3; Sat,  3 Mar 2012 17:40:37 +0100 (CET)
Received: from thinkbox.jade-hamburg.de (unknown [85.183.11.228])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested) (Authenticated sender: teythoon)
	by mail.jade-hamburg.de (Postfix) with ESMTPSA id A3134DF2A2;
	Sat,  3 Mar 2012 17:40:31 +0100 (CET)
Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)
	(envelope-from <teythoon@thinkbox.jade-hamburg.de>)
	id 1S3s0U-0007XB-Lv; Sat, 03 Mar 2012 17:40:30 +0100
From: Justus Winter <4winter@informatik.uni-hamburg.de>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] Use autotools config.sub for --host and --build parsing
Date: Sat,  3 Mar 2012 17:40:23 +0100
Message-Id:
 <1330792823-6049-3-git-send-email-4winter@informatik.uni-hamburg.de>
X-Mailer: git-send-email 1.7.9.1
In-Reply-To:
 <1330792823-6049-1-git-send-email-4winter@informatik.uni-hamburg.de>
References:
 <1330792823-6049-1-git-send-email-4winter@informatik.uni-hamburg.de>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 16:40:42 -0000

This introduces a build dependency on autotools, update debian/control
accordingly.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
---
 configure      |   28 ++++++----------------------
 debian/control |    1 +
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/configure b/configure
index 77203ed..182bd12 100755
--- a/configure
+++ b/configure
@@ -171,33 +171,17 @@ for option; do
     elif [ "${option}" = '--without-zsh-completion' ] ; then
 	WITH_ZSH=0
     elif [ "${option%%=*}" = '--build' ] ; then
-	build_option="${option#*=}"
-	case ${build_option} in
-	    *-*-*) ;;
-	    *)
-		echo "Unrecognized value for --build option: ${build_option}"
-		echo "Should be: <cpu>-<vendor>-<os>"
-		echo "See:"
-		echo "	$0 --help"
-		echo ""
-		exit 1
-	esac
+	if ! build_option="`/usr/share/misc/config.sub "${option#*=}"`" ; then
+	    exit 1
+	fi
 	build_cpu=${build_option%%-*}
 	build_option=${build_option#*-}
 	build_vendor=${build_option%%-*}
 	build_os=${build_option#*-}
     elif [ "${option%%=*}" = '--host' ] ; then
-	host_option="${option#*=}"
-	case ${host_option} in
-	    *-*-*) ;;
-	    *)
-		echo "Unrecognized value for --host option: ${host_option}"
-		echo "Should be: <cpu>-<vendor>-<os>"
-		echo "See:"
-		echo "	$0 --help"
-		echo ""
-		exit 1
-	esac
+	if ! host_option="`/usr/share/misc/config.sub "${option#*=}"`" ; then
+	    exit 1
+	fi
 	host_cpu=${host_option%%-*}
 	host_option=${host_option#*-}
 	host_vendor=${host_option%%-*}
diff --git a/debian/control b/debian/control
index b60790e..bfb5f01 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
  David Bremner <bremner@debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
+ autotools-dev,
  pkg-config,
  libxapian-dev,
  libgmime-2.6-dev | libgmime-2.4-dev,
-- 
1.7.9.1