[pkgsrc/trunk]: pkgsrc/devel/gettext-lib Do not assume that if /usr/lib/libin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55558f7a896c
branches:  trunk
changeset: 472177:55558f7a896c
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Apr 06 01:29:25 2004 +0000

description:
Do not assume that if /usr/lib/libintl.* does not exist
that it can not be builtin.  So also check for "This file is part
of the GNU C Library".

This helps with systems that have gettext(3) functionality
included in their glibc.

This also fixes build problem under Linux where devel/popt didn't
build "because some functions are defined both in gettext-lib and
in the native libc" as reported by minskim to tech-pkg on 21/Mar/2004.

diffstat:

 devel/gettext-lib/builtin.mk |  17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 654ac95415d8 -r 55558f7a896c devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Mon Apr 05 23:03:52 2004 +0000
+++ b/devel/gettext-lib/builtin.mk      Tue Apr 06 01:29:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2004/04/01 18:33:20 jmmv Exp $
+# $NetBSD: builtin.mk,v 1.6 2004/04/06 01:29:25 reed Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=  \
@@ -14,13 +14,24 @@
 
 .if !defined(IS_BUILTIN.gettext)
 IS_BUILTIN.gettext=    no
-.  if !empty(_BLNK_LIBINTL_FOUND:M[yY][eE][sS]) && exists(${_LIBINTL_H})
+.  if  exists(${_LIBINTL_H})
+.    if !empty(_BLNK_LIBINTL_FOUND:M[Nn][Oo])
 IS_BUILTIN.gettext!=   \
-       if ${GREP} -q "\#define[        ]*__USE_GNU_GETTEXT" ${_LIBINTL_H}; then \
+       if ${GREP} -q "This file is part of the GNU C Library" ${_LIBINTL_H}; then \
                ${ECHO} "yes";                                          \
        else                                                            \
                ${ECHO} "no";                                           \
        fi
+.    endif
+.    if !empty(_BLNK_LIBINTL_FOUND:M[yY][eE][sS])
+IS_BUILTIN.gettext!=   \
+       if ${GREP} -q "\#define[        ]*__USE_GNU_GETTEXT" ${_LIBINTL_H}; then \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
+.    endif
+
 .    if !empty(IS_BUILTIN.gettext:M[yY][eE][sS])
 # XXX
 # XXX Consider the native libintl to be gettext-lib-0.10.35nb1.