summaryrefslogtreecommitdiff
path: root/devel/gettext-lib
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-09-24 18:33:52 +0000
committerjlam <jlam@pkgsrc.org>2007-09-24 18:33:52 +0000
commit724dca06d8b50077cb7e922860656032d8e120fc (patch)
tree3ed406008115d62f72c7e80888776c2e4645669d /devel/gettext-lib
parent866463a40403ff437f8b376fccfa119f3512d1d1 (diff)
downloadpkgsrc-724dca06d8b50077cb7e922860656032d8e120fc.tar.gz
In gettext-lib/buildlink3.mk, check whether we need to pull in the
libiconv/buildlink3.mk file based on whether or not we're using the built-in gettext-lib or not. This is clearer than what existed in revision 1.33 of gettext-lib/builtin.mk and fixes the problem introduced in revision 1.34.
Diffstat (limited to 'devel/gettext-lib')
-rw-r--r--devel/gettext-lib/buildlink3.mk13
-rw-r--r--devel/gettext-lib/builtin.mk3
2 files changed, 11 insertions, 5 deletions
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index d75ac314809..56414ac349d 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2007/09/24 18:33:52 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -16,7 +16,14 @@ BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib
.endif # GETTEXT_BUILDLINK3_MK
-# Let the gettext-lib/builtin.mk pull in libiconv if it's needed.
-#.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+CHECK_BUILTIN.gettext:= yes
+.include "../../devel/gettext-lib/builtin.mk"
+CHECK_BUILTIN.gettext:= no
+
+.if !empty(USE_BUILTIN.gettext:M[nN][oO])
+. include "../../converters/libiconv/buildlink3.mk"
+.endif
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 2f5f0c0d66c..637484921dc 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.35 2007/09/18 14:14:31 joerg Exp $
+# $NetBSD: builtin.mk,v 1.36 2007/09/24 18:33:52 jlam Exp $
BUILTIN_PKG:= gettext
@@ -126,7 +126,6 @@ BUILDLINK_TRANSFORM+= rm:-lintl
. if !empty(USE_BUILTIN.gettext:M[nN][oO])
_BLTN_LIBINTL= -lintl
_BLTN_LIBINTL+= ${BUILDLINK_LDADD.iconv}
-. include "../../converters/libiconv/buildlink3.mk"
. endif
BUILDLINK_LDADD.gettext?= ${_BLTN_LIBINTL}