From: Dennis Stosberg <dennis@stosberg.net>
Date: Thu, 11 May 2006 17:35:31 +0000 (+0200)
Subject: Fix compilation on newer NetBSD systems
X-Git-Tag: v1.3.3~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8;p=git.git

Fix compilation on newer NetBSD systems

NetBSD >=2.0 has iconv() in libc.  A libiconv is not required and
does not exist.

See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0

[jc: with a bit of simplification later discussed on the list.]

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 3972d108..9f6425d2 100644
--- a/Makefile
+++ b/Makefile
@@ -281,7 +281,9 @@ ifeq ($(uname_S),OpenBSD)
 	ALL_LDFLAGS += -L/usr/local/lib
 endif
 ifeq ($(uname_S),NetBSD)
-	NEEDS_LIBICONV = YesPlease
+	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
+		NEEDS_LIBICONV = YesPlease
+	endif
 	ALL_CFLAGS += -I/usr/pkg/include
 	ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
 endif