[pkgsrc/trunk]: pkgsrc/devel/gettext-lib In gettext-lib/buildlink3.mk, check ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec2b8ca2349c
branches:  trunk
changeset: 533692:ec2b8ca2349c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Sep 24 18:33:52 2007 +0000

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

 devel/gettext-lib/buildlink3.mk |  13 ++++++++++---
 devel/gettext-lib/builtin.mk    |   3 +--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r d74d1393bffb -r ec2b8ca2349c devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Mon Sep 24 16:24:48 2007 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Mon Sep 24 18:33:52 2007 +0000
@@ -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_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 -r d74d1393bffb -r ec2b8ca2349c devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Mon Sep 24 16:24:48 2007 +0000
+++ b/devel/gettext-lib/builtin.mk      Mon Sep 24 18:33:52 2007 +0000
@@ -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 @@
 .  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}