From 617a23cc2b45571f9341d61138e63b729c369a17 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Tue, 4 Nov 2003 23:00:00 +0000
Subject: Only configure with libiconv if has libiconv (by using new
 ICONV_IS_GNU). This fixes build failure under glibc system that doesn't have
 any libiconv.

---
 editors/abiword/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'editors')

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d8ae5270888..052f8593593 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2003/10/11 13:40:19 grant Exp $
+# $NetBSD: Makefile,v 1.59 2003/11/04 23:00:00 reed Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -28,7 +28,6 @@ USE_GNU_ICONV=	# defined
 GNU_CONFIGURE=	# defined
 MAKEFILE=	GNUmakefile
 
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-psiconv=${BUILDLINK_PREFIX.psiconv}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--without-libwmf
@@ -47,6 +46,11 @@ MAKE_FLAGS+=	ABI_BUILD_VERSION="${ABIWORD_VERS}"
 MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
 
 .include "../../converters/libiconv/buildlink2.mk"
+
+.if defined(ICONV_IS_GNU)
+CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
+.endif
+
 .include "../../converters/psiconv/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
-- 
cgit v1.2.3