diff options
| author | jlam <jlam> | 2002-12-02 22:06:55 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-12-02 22:06:55 +0000 |
| commit | 4ee0a8e86673101c7b6df03d937cd53b143c07a8 (patch) | |
| tree | 6bf12e27a23a0c51dda439addcb65906c2bcb593 | |
| parent | 7242476a772eaf90be0787d745b8892e633ec699 (diff) | |
| download | pkgsrc-4ee0a8e86673101c7b6df03d937cd53b143c07a8.tar.gz | |
gettext-0.11.5's gettext.m4, used by newer GNU configure scripts, no longer
uses a compile/link test to determine the presence or absence of libintl.
Instead it uses a file existence test for libintl.{a,so,la} in specific
directories. buildlink2 can't work around this, but gettext.m4 does
provide a new configure option "--with-libintl-prefix" to specify in which
directory to look for libintl, so use it. It's harmless on older GNU
configure scripts as they will ignore unknown options, but it will fix
gettext detection with newer GNU configure scripts that use the new
gettext.m4. Also protect a forced cache value from being passed to the
configure script unless libintl really does exist.
| -rw-r--r-- | devel/gettext-lib/buildlink2.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk index f1b7add348f..d161be6953c 100644 --- a/devel/gettext-lib/buildlink2.mk +++ b/devel/gettext-lib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.12 2002/11/27 17:41:07 drochner Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2002/12/02 22:06:55 jlam Exp $ .if !defined(GETTEXT_BUILDLINK2_MK) GETTEXT_BUILDLINK2_MK= # defined @@ -84,11 +84,11 @@ _BLNK_LIBINTL+= -lintl .if defined(GNU_CONFIGURE) LIBS+= ${_BLNK_LIBINTL} CONFIGURE_ENV+= INTLLIBS="${_BLNK_LIBINTL}" +CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} . if ${_NEED_GNU_GETTEXT} == "NO" -#CONFIGURE_ENV+= INCINTL="${_BLNK_INCINTL}" -#CONFIGURE_ENV+= LIBINTL="${_BLNK_LIBINTL}" -#CONFIGURE_ENV+= gt_cv_func_gnugettext_libintl="yes" +. if ${_BLNK_LIBINTL_FOUND} == "YES" CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl="yes" +. endif . endif .endif |