unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
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	[thread overview]
Message-ID: <1330792823-6049-3-git-send-email-4winter@informatik.uni-hamburg.de> (raw)
In-Reply-To: <1330792823-6049-1-git-send-email-4winter@informatik.uni-hamburg.de>

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

  parent reply	other threads:[~2012-03-03 16:40 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-03 16:40 [rfc] autotools compatibility and Hurd as platform Justus Winter
2012-03-03 16:40 ` [PATCH 1/2] Add GNU as a valid platform Justus Winter
2012-03-03 16:40 ` Justus Winter [this message]
2012-03-05  2:20 ` [rfc] autotools compatibility and Hurd as platform David Bremner
2012-03-05 10:23   ` [PATCH 1/2] Add GNU as a valid platform Justus Winter
2012-03-05 10:23     ` [PATCH 2/2] Do not try to parse the options for --build and --host arguments Justus Winter
2012-03-18 15:38     ` [PATCH 1/2] Add GNU as a valid platform David Bremner
2012-03-20 11:20     ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330792823-6049-3-git-send-email-4winter@informatik.uni-hamburg.de \
    --to=4winter@informatik.uni-hamburg.de \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).