Mon Aug 20 04:56:00 2012 UTC ()

Rather than assuming SunOS == libiconv, use ICONV_TYPE in the usual manner
to correctly express what variety of iconv we are using.

Fixes build on Linux systems with PREFER_PKGSRC=yes.


(dsainty)

diff -r1.23 -r1.24 pkgsrc/devel/pkg-config/Makefile

--- pkgsrc/devel/pkg-config/Makefile 2012/08/18 14:40:12 1.23
+++ pkgsrc/devel/pkg-config/Makefile 2012/08/20 04:56:00 1.24

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/08/18 14:40:12 tron Exp $
+# $NetBSD: Makefile,v 1.24 2012/08/20 04:56:00 dsainty Exp $
 
 DISTNAME=	pkg-config-0.27
 PKGREVISION=	1
@@ -39,9 +39,11 @@
 .endif
 
 .if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-libiconv=gnu
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
+
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
+CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
 
 PKGCONFIG_EXTRA_PATHS=	# empty