Skip to content

Commit c3b52d8

Browse files
author
ripley
committed
deprecate use of internal libintl
git-svn-id: https://svn.r-project.org/R/trunk@87918 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 4d9fbb4 commit c3b52d8

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67322,6 +67322,11 @@ if test "${ac_cv_sizeof_size_t}" = 4; then
6732267322
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 32-bit build -- this is little tested" >&5
6732367323
printf "%s\n" "$as_me: WARNING: 32-bit build -- this is little tested" >&2;}
6732467324
fi
67325+
if test "${USE_INCLUDED_LIBINT}" = "yes"; then
67326+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using the bundled libintl is deprecated." >&5
67327+
printf "%s\n" "$as_me: WARNING: Using the bundled libintl is deprecated." >&2;}
67328+
fi
67329+
6732567330

6732667331
### Local variables: ***
6732767332
### mode: outline-minor ***

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,6 +3382,10 @@ fi
33823382
if test "${ac_cv_sizeof_size_t}" = 4; then
33833383
AC_MSG_WARN([32-bit build -- this is little tested])
33843384
fi
3385+
if test "${USE_INCLUDED_LIBINT}" = "yes"; then
3386+
AC_MSG_WARN([Using the bundled libintl is deprecated.])
3387+
fi
3388+
33853389

33863390
### Local variables: ***
33873391
### mode: outline-minor ***

doc/NEWS.Rd

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,13 @@
310310
\code{"MethodsList"} branches of functions \code{assignMethodsMetaData},
311311
\code{finalDefaultMethod}, and \code{MethodAddCoerce}.
312312

313-
\item \code{getMethods(*, table=TRUE)} is also deprecated.
313+
\item \code{getMethods(*, table = TRUE)} is deprecated.
314+
315+
\item Bulding with the bundled (and old) version of \code{libintl}
316+
is deprecated and gives a \command{configure warning}. Use
317+
\code{libintl} from a recent version of GNU gettext instead. (If
318+
the OS's \code{libc} includes \code{libintl} that will be chosen
319+
by \command{configure} -- \code{glibc} does.)
314320
}
315321
}
316322

doc/manual/R-admin.texi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3401,8 +3401,9 @@ the C include path or under @file{/usr/include/tirpc}.
34013401

34023402
Thr @R{} sources contain an older copy of @code{libintl} from GNU
34033403
@code{gettext} which is used if this is not part of @code{libc} (as it is
3404-
when using @code{glibc}) nor found as an external library. This is
3405-
desirable and is planned to be required in future.
3404+
when using @code{glibc}) nor found as an external library. The internal
3405+
copy is deprecated and may be removed in the near
3406+
future---@command{configure} warns when it is used.
34063407

34073408
Library @code{libdeflate} (@url{https://github.com/ebiggers/libdeflate})
34083409
is used by @code{memCompress()} and @code{memDecompress()} if available.

0 commit comments

Comments
 (0)