Include ../../converters/libiconv/buildlink3.mk in buildlink3.mk,

and let it worry about whether libiconv is built-in or not.  Remove
all references to libiconv from builtin.mk.

The logic in builtin.mk was broken and unnecessary, leading to a
build failure on at least some Linux systems (such as Debian woody
without any gettext packages installed).

2 files changed, 5 insertions, 45 deletions

diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index d412e136d0f..4c5a7058a19 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2004/10/03 00:13:27 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2005/04/19 14:55:30 epg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -16,7 +16,6 @@ BUILDLINK_RECOMMENDED.gettext+=	gettext-lib>=0.11.5nb4
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 .endif	# GETTEXT_BUILDLINK3_MK
 
-# libiconv/buildlink3.mk is included by gettext-lib/builtin.mk
-#.include "../../converters/libiconv/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 49355f019dd..266a7536ae8 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2004/12/11 00:32:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.18 2005/04/19 14:55:30 epg Exp $
 
 .for _lib_ in intl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -37,10 +37,6 @@ BUILDLINK_VARS+=	BUILTIN_PKG.gettext
 .  endif
 .endif	# IS_BUILTIN.gettext
 
-#.if defined(USE_BUILTIN.iconv) && !empty(USE_BUILTIN.iconv:M[nN][oO])
-#USE_BUILTIN.gettext=	no
-#.endif
-
 .if !defined(USE_BUILTIN.gettext)
 USE_BUILTIN.gettext?=	${IS_BUILTIN.gettext}
 PREFER.gettext?=		pkgsrc
@@ -82,7 +78,7 @@ USE_BUILTIN.gettext=	no
 # XXX By default, assume the native gettext on Linux systems using GLIBC
 # XXX supports the GNU gettext API, and use it.
 # XXX
-.    if (${OPSYS} == "Linux") && exists(${_LIBICONV_H})
+.    if (${OPSYS} == "Linux")
 USE_BUILTIN.gettext!=	\
 	if ${GREP} -q "This file is part of the GNU C Library" ${_LIBINTL_H}; then \
 		${ECHO} "yes";						\
@@ -130,41 +126,6 @@ BUILDLINK_TRANSFORM+=	rm:-lintl
 ######################################################################
 .if !empty(USE_BUILTIN.gettext:M[nN][oO])
 _BLNK_LIBINTL=		-lintl
-#
-# Determine if we need to include the libiconv buildlink3.mk file.
-# We need to if we're using the pkgsrc gettext, and the version is
-# at least gettext>=0.11.5nb1.
-#
-_GETTEXT_ICONV_DEPENDS=	gettext-lib>=0.11.5nb1
-.  if !defined(_GETTEXT_NEEDS_ICONV)
-_GETTEXT_NEEDS_ICONV?=	no
-.    for _depend_ in ${BUILDLINK_DEPENDS.gettext}
-.      if !empty(_GETTEXT_NEEDS_ICONV:M[nN][oO])
-_GETTEXT_NEEDS_ICONV!=	\
-	if ${PKG_INFO} -qe '${_depend_}'; then				\
-		pkg=`${PKG_BEST_EXISTS} '${_depend_}'`;			\
-		if ${PKG_INFO} -qN "$$pkg" | ${GREP} -q "libiconv-[0-9]"; then \
-			${ECHO} "yes";					\
-		else							\
-			${ECHO} "no";					\
-		fi;							\
-	else								\
-		${ECHO} "yes";						\
-	fi
-.      endif
-.    endfor
-.  endif
-.  if !empty(_GETTEXT_NEEDS_ICONV:M[yY][eE][sS])
-.    for _mkfile_ in buildlink3.mk builtin.mk
-.      if exists(../../converters/libiconv/${_mkfile_})
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-.        include "../../converters/libiconv/${_mkfile_}"
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-.      endif
-.    endfor
-BUILDLINK_DEPENDS.gettext+=	${_GETTEXT_ICONV_DEPENDS}
-_BLNK_LIBINTL+=			${BUILDLINK_LDADD.iconv}
-.  endif
 .endif
 
 BUILDLINK_LDADD.gettext?=	${_BLNK_LIBINTL}
@@ -174,7 +135,7 @@ BUILDLINK_LDADD.gettext?=	${_BLNK_LIBINTL}
 # "-lintl" to the linker command line.
 #
 # If BROKEN_GETTEXT_DETECTION is "yes", then automatically add "-lintl"
-# (and "-liconv" if necessary) to LIBS to workaround this brokenness.
+# to LIBS to workaround this brokenness.
 #
 # XXX Nowadays, most packages' GNU configure scripts correctly detect
 # XXX -lintl, so this should really default to "no", but we'll leave it