update

git-svn-id: https://svn.r-project.org/R/trunk@87917 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

configure

@@ -63493,8 +63493,10 @@ esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+                                    gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>

doc/NEWS.Rd

@@ -279,6 +279,10 @@
       \item There is now support for installing the debug symbols for
       recommended packages on macOS: see \samp{REC_INSTALL_OPT} in file
       \file{config.site}.
+
+      \item \command{configure} is now able to find an external
+      \code{libintl} on macOS (it failed to try linking with the macOS
+      Core Foundation framework).
     }
   }
 

doc/manual/R-admin.texi

@@ -3296,11 +3296,12 @@ Those distributing binary versions of @R{} may need to be aware of the
 licences of the external libraries it is linked to (including `useful'
 libraries from the next section).  The @code{liblzma} library is in the
 public domain and X11, @code{libbzip2}, @code{libcurl} and @code{zlib}
-have MIT-style licences. PCRE and PCRE2 have a BSD-style licence which
+have MIT-style licences. PCRE1 and PCRE2 have a BSD-style licence which
 requires distribution of the licence (included in @R{}'s
 @file{COPYRIGHTS} file) in binary distributions.  GNU @code{readline} is
 licensed under GPL (which version(s) of GPL depends on the
-@code{readline} version).
+@code{readline} version). @code{libzstd} is dual-licensed with either a
+BSD or GPL licence and used in @R{} under the latter.
 
 
 @node Useful libraries and programs
@@ -3398,25 +3399,34 @@ headers@footnote{@R{} uses @file{rpc/xdr.h} but that includes
 @file{netconfig.h} from the top @file{tirpc} directory.} need to be on
 the C include path or under @file{/usr/include/tirpc}.
 
+Thr @R{} sources contain an older copy of @code{libintl} from GNU
+@code{gettext} which is used if this is not part of @code{libc} (as it is
+when using @code{glibc}) nor found as an external library.  This is
+desirable and is planned to be required in future.
+
 Library @code{libdeflate} (@url{https://github.com/ebiggers/libdeflate})
 is used by @code{memCompress()} and @code{memDecompress()} if available.
 
+The compresson library for @code{zstd} is used if available.  It might
+be named @code{libzstd} or be part of a package including the
+@command{zstd} utilities.
+
 Use of the X11 clipboard selection requires the @code{Xmu} headers and
 libraries.  These are normally part of an X11 installation (e.g.@: the
 Debian meta-package @samp{xorg-dev}), but some distributions have split
 this into smaller parts, so for example recent versions of Fedora
 require the @samp{libXmu} and @samp{libXmu-devel} @abbr{RPM}s.
 
-Some systems (notably macOS and at least some FreeBSD systems) have
+Some systems (notably macOS and some FreeBSD systems) have had
 inadequate support for collation in multibyte locales.  It is possible
 to replace the OS's collation support by that from ICU (International
 Components for Unicode, @uref{https://icu.unicode.org/}), and this
 provides much more precise control over collation on all systems.  ICU
 is available as sources and as binary distributions for (at least) most
-Linux distributions, FreeBSD, macOS and @abbr{AIX}, usually as @code{libicu} or
-@code{icu4c}.  It will be used by default where available: should a very
-old or broken version of ICU be found this can be suppressed by
-@option{--without-ICU}.
+Linux distributions, FreeBSD, macOS and @abbr{AIX}, usually as
+@code{libicu} or @code{icu4c}.  It will be used by default where
+available: should a very old or broken version of ICU be found this can
+be suppressed by @option{--without-ICU}.
 
 The @code{bitmap} and @code{dev2bitmap} devices and function
 @code{embedFonts()} use @I{Ghostscript}
@@ -3431,7 +3441,7 @@ a useful checklist for other systems:
 @example
 bzip2 cairo fontconfig freetype fribidi gcc gcc-gfortran gcc-c++ glib2
 glibc harfbuzz lapack libX11 libXext libXt libcurl libdeflate libicu
-libjpeg libpng libtiff libtirpc libxcrypt ncurses pango
+libjpeg libpng libtiff libtirpc libxcrypt libzstd ncurses pango
 pkgconf-pkg-config pcre2 readline tcl tk xz zlib
 @end example
 @noindent
@@ -5171,11 +5181,12 @@ the full range of bitmapped graphics devices.  (Some builds of
 @code{tiff} may require @code{libwebp} and/or @code{openjpeg}.)
 
 @item
-Component @code{libdeflate} for faster internal (de)compression.
+Component @code{libdeflate} for faster internal (de)compression and
+@code{zstd} for support for that type of compression.
 
-@c @item
-@c Component @code{gettext} for @code{libintl}, an updated version of that
-@c in the @R{} sources.
+@item
+Component @code{gettext} for @code{libintl}, an updated version of that
+in the @R{} sources.
 
 @item
 An X sub-system unless configuring using @option{--without-x}: see

m4/gettext.m4

@@ -6,6 +6,7 @@
 ## wchar_t.m4 wint_t.m4 xsize.m4 > .../m4/gettext.m4
 
 ## 2022-09-28 modify to have prototypes, for clang 15.
+## 2025-03-09 test with macOS libs for external libiconv too.
 
 ## Then disable testing for libiconv prefix
 
@@ -199,8 +200,11 @@ extern
 const char *_nl_expand_alias (const char *);]], [[bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")]])],[eval "$gt_func_gnugettext_libintl=yes"],[eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
+            dnl OS dependent libraries, specifically on macOS.
+            gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+               && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+              LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;

src/extra/intl/R_changes

@@ -18,12 +18,17 @@ Various small changes were made to avoid warnings.
 
 BDR
 
-One more change for macOS: the locale detection is simply off-loaded
+One more change for macOS: the charset detection is simply off-loaded
 to locale2charset, because the built-in detection in gettext doesn't work.
 This also ensures that R and gettext are in sync wrt the charset used.
 
 SU
 
+2025-03-09: m4/gattext.m4 was modified using ideas from gettext-0.24
+  to correctly detected an external libintl on macOS.
+langorefs.c updated to that from gettext-0.24 for allegedly improved
+  behaviour on macOS.
+
 diff -ru intl/dcigettext.c ../extra/intl/dcigettext.c
 --- intl/dcigettext.c	2007-10-21 19:41:41.000000000 +0100
 +++ ../extra/intl/dcigettext.c	2008-01-13 14:39:54.703125000 +0000