Code

Fix compilation on newer NetBSD systems
authorDennis Stosberg <dennis@stosberg.net>
Thu, 11 May 2006 17:35:31 +0000 (19:35 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 May 2006 20:00:01 +0000 (13:00 -0700)
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>
Makefile

index 3972d10886f649eea298191f24a76591de4a705c..9f6425d20019f1458f4f173d5375f45a6cda1db4 100644 (file)
--- 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