diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-21 02:40:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-21 02:40:15 +0000 |
| commit | d9cb6e54aba40c8a300662513b2cb73e2d952a61 (patch) | |
| tree | 20dc9ee74eb83fac76cdb473b823d4378b3831a5 /devel | |
| parent | b899dccdcf0d62fb1465334991a2e0a31e78ff51 (diff) | |
| download | pkgsrc-d9cb6e54aba40c8a300662513b2cb73e2d952a61.tar.gz | |
Move the section that sets up some GNU configure variables to force
"GNU gettext" detection outside of the BROKEN_GETTEXT_DETECTION block.
We will need this to happen all the time if we're using a built-in
gettext that isn't really GNU gettext.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gettext-lib/builtin.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index dfd2522ffd3..e96fb222cbf 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.12 2004/11/14 04:05:16 jlam Exp $ +# $NetBSD: builtin.mk,v 1.13 2004/11/21 02:40:15 jlam Exp $ .if !defined(_BLNK_LIBINTL_FOUND) _BLNK_LIBINTL_FOUND!= \ @@ -178,16 +178,22 @@ BUILDLINK_LDADD.gettext?= ${_BLNK_LIBINTL} BROKEN_GETTEXT_DETECTION?= yes .if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) BUILDLINK_LIBS.gettext+= ${BUILDLINK_LDADD.gettext} -CONFIGURE_ENV+= INTLLIBS="${BUILDLINK_LDADD.gettext}" -. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -. if !empty(_BLNK_LIBINTL_FOUND:M[yY][eE][sS]) +CONFIGURE_ENV+= INTLLIBS="${BUILDLINK_LDADD.gettext}" +.endif # BROKEN_GETTEXT_DETECTION + +# If using a built-in libintl that isn't from GNU gettext, then set up +# some GNU configure variables that are checked by modern gettext.m4 +# so that it will detect "GNU gettext" in the existing libintl. +# +.if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +. if !empty(_BLNK_LIBINTL_FOUND:M[yY][eE][sS]) +CONFIGURE_ENV+= gt_cv_func_gnugettext_libintl="yes" CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl="yes" -. if defined(_GETTEXT_NGETTEXT) && !empty(_GETTEXT_NGETTEXT:M[yY][eE][sS]) +. if defined(_GETTEXT_NGETTEXT) && !empty(_GETTEXT_NGETTEXT:M[yY][eE][sS]) CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl="yes" -. endif . endif . endif -.endif # BROKEN_GETTEXT_DETECTION +.endif .if defined(GNU_CONFIGURE) . if !empty(USE_BUILTIN.gettext:M[nN][oO]) |