Skip to content

Commit f473b33

Browse files
committed
adding v3.2.0
1 parent f38fe31 commit f473b33

File tree

1,560 files changed

+79790
-78496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,560 files changed

+79790
-78496
lines changed

Makeconf.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ CC = @CC@
1717
CFLAGS = @CFLAGS@ @LTO@
1818
CPICFLAGS = @CPICFLAGS@
1919
CPPFLAGS = @CPPFLAGS@
20+
CURL_CPPFLAGS = @CURL_CPPFLAGS@
21+
CURL_LIBS = @CURL_LIBS@
2022
DEFS = @DEFS@ @R_DEFS@
2123
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)" --exclude="*~"
2224
DYLIB_EXT = @DYLIB_EXT@
@@ -46,6 +48,10 @@ LIBM = @LIBM@
4648
LIBR0 = @LIBR0@
4749
LIBR1 = @LIBR1@
4850
LIBR = @LIBR0@ @LIBR1@
51+
## These are the libs which the final R.bin/libR is linked against.
52+
## Many of these used to be optional: ICU libs still are.
53+
## There may be platform-specific ones, e.g.
54+
## -lrt -ldl on Linux, -lnsl -lsocket -lrt -lsunmath -ldl -liconv on Solaris.
4955
LIBS = @LIBS@
5056
LIBnn = @LIBnn@
5157
LIBTOOL = @LIBTOOL@

Makefile.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ top_builddir = .
99

1010
include $(top_builddir)/Makeconf
1111

12+
GIT = `if [ -d "$(top_builddir)/.git" ]; then echo "git"; fi`
13+
1214
distdir = $(PACKAGE)-$(VERSION)
1315
INSTFILES = COPYING
1416
NON_SVN_INSTFILES = SVN-REVISION
@@ -104,7 +106,7 @@ svnonly:
104106
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
105107
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
106108
touch non-tarball ; \
107-
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || $(ECHO) "Revision: -99") 2> /dev/null \
109+
(cd $(srcdir); LC_ALL=C TZ=GMT $(GIT) svn info || $(ECHO) "Revision: -99") 2> /dev/null \
108110
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
109111
| cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
110112
if test "`cat SVN-REVISION-tmp`" = "Revision: -99"; then \
@@ -128,7 +130,7 @@ install-libR:
128130
install-libR-exists:
129131
@$(MKINSTALLDIRS) "$(DESTDIR)${libdir}"
130132
@$(INSTALL_DATA) -m755 lib$(R_ARCH)/$(libR_la) "$(DESTDIR)${libdir}"
131-
uninstall-libR:
133+
uninstall-libR:
132134
@rm -f "$(DESTDIR)${libdir}/$(libR_la)"
133135

134136
installdirs:

SVN-REVISION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Revision: 67962
2-
Last Changed Date: 2015-03-09
1+
Revision: 68180
2+
Last Changed Date: 2015-04-16

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.3
1+
3.2.0

VERSION-NICK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Smooth Sidewalk
1+
Full of Ingredients

config.site

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,3 +261,17 @@
261261
## Additional libraries to link the internet module against.
262262
## Some claim Solaris needs -lsocket -lnsl
263263
## INTERNET_LIBS=
264+
265+
## Script from texinfo 5.1 or later.
266+
## Can be texi2any (the default) or makeinfo or a full path to either.
267+
## MAKEINFO=
268+
269+
## Full path to version of curl-config to be used
270+
## CURL_CONFIG=
271+
## Use these to override curl-config if needed.
272+
## Used as from R 3.2.0.
273+
## CURL_CPPFLAGS=
274+
## CURL_LIBS=
275+
## To force a static link use the line below: this is only needed
276+
## if both shared and static libcurl libraries were built.
277+
## CURL_LIBS=`curl-config --static-libs`

0 commit comments

Comments
 (0)