cygport package has one dependency missing

[Jon TURNEY]

On 27/02/2015 06:24, Yaakov Selkowitz wrote:
> On Tue, 2015-02-24 at 10:55 +0100, Marcos Vives Del Sol wrote:
>> File "/usr/share/cygport/cygclass/autotools.cygclass" requires
>> "autopoint", which is part of "gettext-devel" package but it isn't
>> specified in the setup.hint, and therefore it doesn't get installed
>> when selecting "cygport".
>
> If you are building a package with NLS, even manually, you need
> gettext-devel installed for msgfmt and friends.  Therefore, this is
> technically not a requirement of cygport but a build requirement of your
> package, just like any other lib*-devel packages that you need to build
> your package.

I feel this could be handled better, though.  Patch attached.


-------------- next part --------------
From f068b6ef468331654442a71d28b29d562a0ef619 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri, 27 Feb 2015 20:23:30 +0000
Subject: [PATCH] autotools: Avoid grepping stdin if autopoint is not present
 on PATH

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
 cygclass/autotools.cygclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cygclass/autotools.cygclass b/cygclass/autotools.cygclass
index 301bdd3..ac4e467 100644
--- a/cygclass/autotools.cygclass
+++ b/cygclass/autotools.cygclass
@@ -484,7 +484,7 @@ cygautoreconf() {
 
 		# libtool 2.2+ is incompatible with gettext before 0.17
 		# config.rpath is broken wrt dynamic linkage before 0.17
-		eval gettext_$(grep ^version= $(which ${AUTOPOINT}))
+		eval gettext_$(grep ^version= $(which ${AUTOPOINT} || echo /dev/null))
 		if ! __version_at_least 0.17 ${gettext_version}
 		then
 			error "cygautoreconf: at least gettext 0.17 required"
-- 
2.1.4