Fri Jan 25 14:42:27 2008 UTC ()
On Linux, just assume that if /usr/include/libintl.h exists, that it is
GNU gettext. This works around amd64 issues on Gentoo.


(joerg)
diff -r1.36 -r1.37 pkgsrc/devel/gettext-lib/builtin.mk
cvs diff -r1.36 -r1.37 pkgsrc/devel/gettext-lib/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/builtin.mk 2007/09/24 18:33:52 1.36
+++ pkgsrc/devel/gettext-lib/builtin.mk 2008/01/25 14:42:27 1.37
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: builtin.mk,v 1.36 2007/09/24 18:33:52 jlam Exp $ 1# $NetBSD: builtin.mk,v 1.37 2008/01/25 14:42:27 joerg Exp $
 2
 3.include "../../mk/bsd.fast.prefs.mk"
2 4
3BUILTIN_PKG:= gettext 5BUILTIN_PKG:= gettext
4 6
5BUILTIN_FIND_LIBS:= intl 7BUILTIN_FIND_LIBS:= intl
6BUILTIN_FIND_FILES_VAR:= H_GETTEXT _BLTN_H_GETTEXT 8BUILTIN_FIND_FILES_VAR:= H_GETTEXT _BLTN_H_GETTEXT
7BUILTIN_FIND_FILES.H_GETTEXT= /usr/include/libintl.h 9BUILTIN_FIND_FILES.H_GETTEXT= /usr/include/libintl.h
8BUILTIN_FIND_FILES._BLTN_H_GETTEXT= /usr/include/libintl.h 10BUILTIN_FIND_FILES._BLTN_H_GETTEXT= /usr/include/libintl.h
 11.if ${OPSYS} != "Linux"
9BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT 12BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT
 13.endif
10 14
11.include "../../mk/buildlink3/bsd.builtin.mk" 15.include "../../mk/buildlink3/bsd.builtin.mk"
12 16
13### 17###
14### Determine if there is a built-in implementation of the package and 18### Determine if there is a built-in implementation of the package and
15### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 19### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
16### 20###
17.if !defined(IS_BUILTIN.gettext) 21.if !defined(IS_BUILTIN.gettext)
18IS_BUILTIN.gettext= no 22IS_BUILTIN.gettext= no
19. if empty(H_GETTEXT:M__nonexistent__) && \ 23. if empty(H_GETTEXT:M__nonexistent__) && \
20 empty(H_GETTEXT:M${LOCALBASE}/*) && \ 24 empty(H_GETTEXT:M${LOCALBASE}/*) && \
21 !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) 25 (!empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) || ${OPSYS} == "Linux")
22IS_BUILTIN.gettext= yes 26IS_BUILTIN.gettext= yes
23. endif 27. endif
24.endif 28.endif
25MAKEVARS+= IS_BUILTIN.gettext 29MAKEVARS+= IS_BUILTIN.gettext
26 30
27.if !defined(BUILTIN_GETTEXT_NGETTEXT) 31.if !defined(BUILTIN_GETTEXT_NGETTEXT)
28BUILTIN_GETTEXT_NGETTEXT= no 32BUILTIN_GETTEXT_NGETTEXT= no
29. if empty(_BLTN_H_GETTEXT:M__nonexistent__) 33. if empty(_BLTN_H_GETTEXT:M__nonexistent__)
30BUILTIN_GETTEXT_NGETTEXT!= \ 34BUILTIN_GETTEXT_NGETTEXT!= \
31 if ${GREP} -q "char.*ngettext" ${_BLTN_H_GETTEXT:Q}; then \ 35 if ${GREP} -q "char.*ngettext" ${_BLTN_H_GETTEXT:Q}; then \
32 ${ECHO} yes; \ 36 ${ECHO} yes; \
33 else \ 37 else \
34 ${ECHO} no; \ 38 ${ECHO} no; \