pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/abiword Only configure with libiconv if has li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7fbe7de608f
branches:  trunk
changeset: 463284:f7fbe7de608f
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Nov 04 23:00:00 2003 +0000

description:
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.

diffstat:

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

diffs (29 lines):

diff -r 06266c35688c -r f7fbe7de608f editors/abiword/Makefile
--- a/editors/abiword/Makefile  Tue Nov 04 20:58:28 2003 +0000
+++ b/editors/abiword/Makefile  Tue Nov 04 23:00:00 2003 +0000
@@ -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 @@
 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+=   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"



Home | Main Index | Thread Index | Old Index