summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2004-10-27 02:50:19 +0000
committerreed <reed@pkgsrc.org>2004-10-27 02:50:19 +0000
commitae60c60f85de85dba5f193e8a1b9a578fbef3f6f (patch)
treefdfd3820529c78a622cb3e35819c01095cf26b13
parentce8e2305a28a16c478f69b0f12a092462d59a37c (diff)
downloadpkgsrc-ae60c60f85de85dba5f193e8a1b9a578fbef3f6f.tar.gz
Only force USE_BUILTIN.iconv=no for non-Linux.
Linux systems have glibc which provides a good GNU iconv. What GNU iconv feature/function is specifically needed for abiword? This should be fixed to not define USE_BUILTIN.iconv=no but to use some other option, because it overrides PREFER_NATIVE use for iconv. Also at this time, converters/libiconv doesn't get built nor installed under Linux. So abiword's build failed.
-rw-r--r--editors/abiword/Makefile.common5
1 files changed, 4 insertions, 1 deletions
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index adcb0d8cc7a..5e49405558a 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/10/27 01:05:53 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/10/27 02:50:19 reed Exp $
#
ABIWORD_DIST_VERSION= 2.0.11
@@ -23,7 +23,10 @@ USE_GNU_TOOLS+= make
USE_PERL5= run
USE_X11= yes
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Linux" # iconv is not needed for Linux; it is included in glibc
USE_BUILTIN.iconv= no # Make sure we get libiconv dependency.
+.endif
CONFIGURE_ARGS+= --enable-threads
CONFIGURE_ARGS+= --with-libxml2