revert r87916 as it does not build on Windows

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

Author: ripley

configure

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

configure.ac

@@ -2926,14 +2926,21 @@ 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
-    XTRA_INTL_CPPFLAGS=-I/System/Library/Frameworks/CoreFoundation.framework/Headers
+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)
   fi
   echo "Finished configuring src/extra/intl directory"
   echo
 else
   USE_INCLUDED_LIBINTL=no
 fi
-AC_SUBST(XTRA_INTL_CPPFLAGS)
+dnl AC_SUBST(XTRA_INTL_CPPFLAGS)
+AC_SUBST(LIBINTL_PKGS)
 
 AM_CONDITIONAL(USE_NLS, [test "x${USE_NLS}" = xyes])
 AM_CONDITIONAL(BUILD_LIBINTL, [test "x${USE_INCLUDED_LIBINTL}" = xyes])

etc/Makeconf.in

@@ -92,12 +92,15 @@ 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
-LIBINTL= @LIBINTL@
+## 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@
 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@