[pkgsrc/trunk]: pkgsrc/devel/gettext-lib Ensure that BUILTIN_GETTEXT_NGETTEXT...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/947c20fec9b1
branches:  trunk
changeset: 495055:947c20fec9b1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 21:07:59 2005 +0000

description:
Ensure that BUILTIN_GETTEXT_NGETTEXT is always defined.

diffstat:

 devel/gettext-lib/builtin.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 110a009e169b -r 947c20fec9b1 devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Wed Jun 01 21:06:16 2005 +0000
+++ b/devel/gettext-lib/builtin.mk      Wed Jun 01 21:07:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.23 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: builtin.mk,v 1.24 2005/06/01 21:07:59 jlam Exp $
 
 BUILTIN_PKG:=  gettext
 
@@ -22,14 +22,17 @@
 .endif
 MAKEVARS+=     IS_BUILTIN.gettext
 
-_BLTNH_GETTEXT=        /usr/include/libintl.h
-.if !defined(BUILTIN_GETTEXT_NGETTEXT) && exists(${_BLTNH_GETTEXT})
+_BLTN_H_GETTEXT=       /usr/include/libintl.h
+.if !defined(BUILTIN_GETTEXT_NGETTEXT)
+BUILTIN_GETTEXT_NGETTEXT=      no
+.  if exists(${_BLTN_H_GETTEXT})
 BUILTIN_GETTEXT_NGETTEXT!=                                             \
-       if ${GREP} -q "char.*ngettext" ${_BLTNH_GETTEXT:Q}; then        \
+       if ${GREP} -q "char.*ngettext" ${_BLTN_H_GETTEXT:Q}; then       \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \
        fi
+.  endif
 .endif
 MAKEVARS+=     BUILTIN_GETTEXT_NGETTEXT
 
@@ -63,9 +66,9 @@
 # XXX enough to replace GNU gettext if it is part of glibc (the GNU C
 # XXX Library).
 # XXX
-.      if exists(${_BLTNH_GETTEXT})
+.      if exists(${_BLTN_H_GETTEXT})
 _BLNK_REPLACE.gettext!=                                                        \
-       if ${GREP} -q "This file is part of the GNU C Library" ${_BLTNH_GETTEXT:Q}; then \
+       if ${GREP} -q "This file is part of the GNU C Library" ${_BLTN_H_GETTEXT:Q}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \