revert r87928 to split it up in smaller pieces

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

Author: ripley

configure

@@ -667,7 +667,7 @@ BUILD_LIBINTL_FALSE
 BUILD_LIBINTL_TRUE
 USE_NLS_FALSE
 USE_NLS_TRUE
-LIBINTL_PKGS
+XTRA_INTL_CPPFLAGS
 POSUB
 LTLIBINTL
 LIBINTL
@@ -63696,9 +63696,7 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
   if test -n "$INTL_MACOSX_LIBS"; then
-     LIBINTL_PKGS =
-   else
-     LIBINTL_PKGS = $(LIBINTL)
+    XTRA_INTL_CPPFLAGS=-I/System/Library/Frameworks/CoreFoundation.framework/Headers
   fi
   echo "Finished configuring src/extra/intl directory"
   echo

configure.ac

@@ -2926,21 +2926,14 @@ if test "${USE_NLS}" = "yes"; then
   AM_GNU_GETTEXT_VERSION(0.16.1)
   AM_GNU_GETTEXT([no-libtool], [need-ngettext], [../extra/intl])
   if test -n "$INTL_MACOSX_LIBS"; then
-dnl This is no longer valid (if it ever was)
-dnl    XTRA_INTL_CPPFLAGS=-I/System/Library/Frameworks/CoreFoundation.framework/Headers
-dnl On a macOS build which uses static libraries, libintk_dgettext
-dnl etc are provided by libR.dylib
-     LIBINTL_PKGS =
-   else
-     LIBINTL_PKGS = $(LIBINTL)
+    XTRA_INTL_CPPFLAGS=-I/System/Library/Frameworks/CoreFoundation.framework/Headers
   fi
   echo "Finished configuring src/extra/intl directory"
   echo
 else
   USE_INCLUDED_LIBINTL=no
 fi
-dnl AC_SUBST(XTRA_INTL_CPPFLAGS)
-AC_SUBST(LIBINTL_PKGS)
+AC_SUBST(XTRA_INTL_CPPFLAGS)
 
 AM_CONDITIONAL(USE_NLS, [test "x${USE_NLS}" = xyes])
 AM_CONDITIONAL(BUILD_LIBINTL, [test "x${USE_INCLUDED_LIBINTL}" = xyes])

etc/Makeconf.in

@@ -92,15 +92,12 @@ JAVA_LIBS = @JAVA_LIBS0@
 JAVA_LD_LIBRARY_PATH = @JAVA_LD_LIBRARY_PATH@
 LAPACK_LIBS = @LAPACK_LIBS@
 LDFLAGS = @LDFLAGS@
-## We only need this is if it is external, as otherwise link to R
-## Oo macOS, where libintl is static and so compiled in, can still link to R
-LIBINTL = @LIBINTL_PKGS@
+## we only need this is if it is external, as otherwise link to R
+LIBINTL= @LIBINTL@
 LIBM = @LIBM@
 LIBR0 = @LIBR0@
 LIBR1 = @LIBR1@
 LIBR = @LIBR0@ @LIBR1@
-## FIXME: LIBS is approporiate for building R,
-## but not for packages if static libse are used.
 LIBS = @LIBS@
 ## needed by R CMD config
 LIBnn = @LIBnn@

src/extra/tzone/Makefile.in

@@ -18,7 +18,7 @@ DEPENDS = $(SOURCES:.c=.d)
 OBJECTS = $(SOURCES:.c=.o)
 @WANT_R_SHLIB_TRUE@ALL_CFLAGS = $(R_XTRA_CFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) @C_VISIBILITY@
 
-ALL_CPPFLAGS=$(R_XTRA_CPPFLAGS) -I$(srcdir) -I$(top_srcdir)/src/main $(CPPFLAGS) $(DEFS)
+ALL_CPPFLAGS=$(R_XTRA_CPPFLAGS) -I$(srcdir) -I$(top_srcdir)/src/main $(CPPFLAGS) $(DEFS) @XTRA_INTL_CPPFLAGS@
 
 R all: Makefile 
 	@$(MAKE) Makedeps

src/modules/lapack/Lapack.c

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001--2025  The R Core Team.
+ *  Copyright (C) 2001--2023  The R Core Team.
  *  Copyright (C) 2003--2010  The R Foundation
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -263,7 +263,7 @@ static SEXP unscramble(const double* imaginary, int n,
 /* Real, general case of eigen */
 static SEXP La_rg(SEXP x, SEXP only_values)
 {
-    bool vectors, complexValues;
+    Rboolean vectors, complexValues;
     int i, n, lwork, info, *xdims, ov;
     double *work, *wR, *wI, *left, *right, *xvals, tmp;
     char jobVL[2] = "N", jobVR[2] = "N";
@@ -306,11 +306,11 @@ static SEXP La_rg(SEXP x, SEXP only_values)
     if (info != 0)
 	error(_("error code %d from Lapack routine '%s'"), info, "dgeev");
 
-    complexValues = false;
+    complexValues = FALSE;
     for (i = 0; i < n; i++)
 	/* This test used to be !=0 for R < 2.3.0.  This is OK for 0+0i */
 	if (fabs(wI[i]) >  10 * R_AccuracyInfo.eps * fabs(wR[i])) {
-	    complexValues = true;
+	    complexValues = TRUE;
 	    break;
 	}
     SEXP ret = PROTECT(allocVector(VECSXP, 2));