[pkgsrc/trunk]: pkgsrc/devel/gettext-lib If builtin libintl has ngettext(), f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0817f4a59e4
branches:  trunk
changeset: 481872:d0817f4a59e4
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Oct 14 03:16:35 2004 +0000

description:
If builtin libintl has ngettext(), force packages requiring gettext
API version 2 to choose the builtin library over GNU gettext shipped
with each package.

In fact, the gettext library included in a package should never be
used.  Otherwise every such package would install charset.alias and
locale.alias, causing conflicts with each other when pkgviews is
enabled.

For platforms without ngettext() in their builtin libintl (assumed to
be gettext-lib-0.10.35nb1 by gettext-lib/builtin.mk), packages
requiring gettext API version 2 must add dependency on
gettext-lib>=0.10.36 to share devel/gettext-lib rather than to link
statically against the included gettext library.

diffstat:

 devel/gettext-lib/builtin.mk |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r d9fd0060e874 -r d0817f4a59e4 devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Thu Oct 14 03:13:00 2004 +0000
+++ b/devel/gettext-lib/builtin.mk      Thu Oct 14 03:16:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2004/10/04 10:42:39 grant Exp $
+# $NetBSD: builtin.mk,v 1.11 2004/10/14 03:16:35 minskim Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=  \
@@ -162,6 +162,9 @@
 .  if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
 .    if ${_BLNK_LIBINTL_FOUND} == "yes"
 CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libintl="yes"
+.      if defined(_GETTEXT_NGETTEXT) && !empty(_GETTEXT_NGETTEXT:Myes)
+CONFIGURE_ENV+=                gt_cv_func_gnugettext2_libintl="yes"
+.      endif
 .    endif
 .  endif
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])