Skip to content

Commit cee8f0c

Browse files
author
ripley
committed
update libintl comments
git-svn-id: https://svn.r-project.org/R/trunk@87935 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 004d3fb commit cee8f0c

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

doc/NEWS.Rd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,15 @@
313313

314314
\item \code{getMethods(*, table = TRUE)} is deprecated.
315315

316-
\item Building with the bundled (and old) version of \code{libintl}
317-
is deprecated and gives a \command{configure warning}. Use
318-
\code{libintl} from a recent version of GNU \I{gettext} instead. (If
319-
the OS's \code{libc} includes \code{libintl} that will be chosen
320-
by \command{configure} -- \code{glibc} does.)
316+
\item Building with the bundled (and old) version of
317+
\code{libintl} is deprecated and now gives a \command{configure
318+
warning}. This should be selected only if neither the OS's
319+
\code{libc} nor an external \code{libintl} library provide
320+
suitable functions.
321+
322+
Instead install \code{libintl} from a recent version of GNU
323+
\I{gettext} or use \command{configure} option
324+
\option{--disable-nls}.
321325
}
322326
}
323327

doc/manual/R-admin.texi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3311,7 +3311,9 @@ The ability to use translated messages makes use of @code{gettext} and
33113311
most likely needs @acronym{GNU} @code{gettext}: you do need this to work
33123312
with new translations, but otherwise the version of the @code{gettext}
33133313
runtime contained in the R sources will be used if no suitable external
3314-
@code{gettext} is found.
3314+
@code{gettext} is found (possibly from @code{libc}) and @R{} was not
3315+
configured with @option{--disable-nls}. Use of the bundled
3316+
@code{gettext} runtime is deprecated and will be reoved soon.
33153317

33163318
@cindex Cairo
33173319
@cindex @I{Pango}

0 commit comments

Comments
 (0)