Commit b3ba0ec8 authored by Radford Neal's avatar Radford Neal

Files from R-2.12.0.

parent f88559a1

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -62,7 +62,6 @@ MAIN_FFLAGS = @MAIN_FFLAGS@
MAIN_LD = @MAIN_LD@
MAIN_LDFLAGS = @MAIN_LDFLAGS@ @WANT_R_SHLIB_FALSE@ @USE_EXPORTFILES_TRUE@ -Wl,-bE:$(top_builddir)/etc/R.exp
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAKEINDEX = @MAKEINDEX@
## need this for bootstrapping
MKINSTALLDIRS = @R_SHELL@ $(top_srcdir)/src/scripts/mkinstalldirs.in
PERL = @PERL@
......
......@@ -10,7 +10,8 @@ top_builddir = .
include $(top_builddir)/Makeconf
distdir = $(PACKAGE)-$(VERSION)
INSTFILES = COPYING NEWS
INSTFILES = COPYING
## plus NEWS and NEWS.pdf, but need to wait until they are generated
NON_SVN_INSTFILES = SVN-REVISION
DISTFILES = $(INSTFILES) \
ChangeLog INSTALL ONEWS OONEWS README VERSION \
......@@ -66,9 +67,6 @@ R: Makefile svnonly
docs: R FORCE
-@(cd doc && $(MAKE) $@)
-@(cd src/library && $(MAKE) $@)
## no longer relevant
#help html latex examples: FORCE
# -@(cd src/library && $(MAKE) $@)
FORCE:
stamp-recommended: R docs
......@@ -84,7 +82,7 @@ install install-strip: installdirs svnonly
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(DESTDIR)$(rhome)"; \
done
@for f in $(NON_SVN_INSTFILES); do \
@for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $${f} "$(DESTDIR)$(rhome)"; \
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) -f $(srcdir)/Makefile.fw top_srcdir=$(top_srcdir) $@
......@@ -118,7 +116,7 @@ installdirs:
uninstall:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
@for f in $(INSTFILES) $(NON_SVN_INSTFILES); do \
@for f in NEWS NEWS.pdf $(INSTFILES) $(NON_SVN_INSTFILES); do \
rm -f "$(DESTDIR)$(rhome)/$${f}"; \
done
@rm -rf "$(DESTDIR)$(Rexecbindir)" "$(DESTDIR)$(rhome)/lib"
......@@ -138,7 +136,7 @@ distclean: clean
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -rf bin include lib library modules gnome
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html ; \
rm -f $(NON_SVN_INSTFILES) NEWS NEWS.pdf non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html doc/html/NEWS.html; \
fi
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
rm -f $(NON_SVN_INSTFILES); \
......@@ -175,7 +173,7 @@ distdir: $(DISTFILES) vignettes
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for f in $(NON_SVN_INSTFILES) ; do \
@for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES) ; do \
cp -p $${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
......
This diff is collapsed.
File added
This diff is collapsed.
This diff is collapsed.
......@@ -62,7 +62,7 @@ Book") and the 1998 book "Programming with Data" (the "Green Book").
All the R functions have been documented in the form of help pages in
an "output independent" form which can be used to create versions for
HTML, LaTeX, text etc. A 1200+ page Reference Index (a collection of
HTML, LaTeX, text etc. A 1800+ page Reference Index (a collection of
all the help pages) can be obtained in a variety of formats. The
manual `An Introduction to R' provides a more user-friendly starting
point, and there is an `R Language Definition' manual and more
......
Revision: 52157
Last Changed Date: 2010-05-31
Revision: 53317
Last Changed Date: 2010-10-15
......@@ -41,11 +41,8 @@
## The command which runs the C compiler.
## If unspecified, a search is made for gcc and cc (in that order).
## To override this choice, specify the name of the command which runs
## the compiler here, for example 'c89'.
## the compiler here, for example 'c99'.
## It is also convenient to set the architecture here, e.g. 'gcc -m32'.
## NB, as from R 2.5.0 configure will append flags for C99 compliance,
## e.g. CC=gcc -std=gnu99
## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS.
## CC=
## Debugging and optimization options for the C compiler.
......@@ -61,7 +58,7 @@
## DEFS=
## The following additional CFLAGS to be used only in the main
## compilation and only in building shared libraries respectively.
## compilation and only in building shared objects respectively.
## For example, on some systems one needs 'MAIN_CFLAGS=-pg' when
## profiling.
## MAIN_CFLAGS=
......@@ -98,7 +95,7 @@
## SAFE_FFLAGS=
## The following additional FFLAGS to be used only in the main
## compilation and only in building shared libraries respectively.
## compilation and only in building shared objects respectively.
## For example, on some systems one needs 'MAIN_FFLAGS=-pg' when
## profiling.
## MAIN_FFLAGS=
......@@ -118,15 +115,14 @@
## MAIN_LDFLAGS=
## Any special flags which must be used when compiling C code to be
## turned into a shared library. This is typically something like
## turned into a shared object. This is typically something like
## '-fpic' or '-fPIC'. If this variable is left unspecified an attempt
## is made to automatically detect the correct value by configure.
## is made to automatically detect the correct value.
## CPICFLAGS=
## The following variable can be used to provide any PIC flags for the
## FORTRAN 77 compiler. If this variable is left
## unspecified an attempt is made to automatically detect the correct
## value by configure.
## FORTRAN 77 compiler. If this variable is left unspecified an
## attempt is made to automatically detect the correct value.
## FPICFLAGS=
## The command to be used to create shared objects which contain object
......@@ -170,18 +166,17 @@
## CXXFLAGS=
## Any special flags which must be used when compiling C++ code to be
## turned into a shared library. If this variable is left unspecified
## an attempt is made to automatically detect the correct value by
## configure.
## turned into a shared object. If this variable is left unspecified
## an attempt is made to automatically detect the correct value.
## CXXPICFLAGS=
## The command to be used to load shared libraries which contain object
## files from a C++ compiler. This is usually the C++ compiler/linker,
## The command to be used to load shared objects which contain object
## files from the C++ compiler. This is usually the C++ compiler/linker,
## but the automatic choice can be overridden by means of this
## variable.
## SHLIB_CXXLD=
## Any special flags which are required when creating shared libraries
## Any special flags which are required when creating shared objects
## containing object files from a C++ compiler. This is usually
## automatically detected by configure, and anything set here will be in
## addition unless SHLIB_CXXLD is given.
......@@ -208,7 +203,7 @@
## Browser default
## Default setting for the R_BROWSER env variable
## If unset configure searches in turn for (currently)
## firefox mozilla galeon kfmclient opera gnome-moz-remote open
## firefox mozilla galeon opera xdg-open kfmclient gnome-moz-remote open
## and uses the full path.
## R_BROWSER=
......@@ -230,7 +225,9 @@
## Tar name
## Set this to prefer a tar which has the capability to automagically
## read compressed archives. The default is to choose 'gtar' (normally
## GNU tar) then 'tar', but other possibilities include 'bsdtar' from
## the libarchive project.
## read compressed archives. The default is to choose 'gtar' or
## 'gnutar'(normally GNU tar) then 'tar'.
## Note that 'bsdtar' (from the libarchive project) is known to create
## archives in a non-POSIX format that untar() cannot read,
## so should be avoided.
## TAR=
This diff is collapsed.
### configure.ac -*- Autoconf -*-
### configure.ac -*- Autoconf -*-
###
### Process this file with autoconf to produce a configure script.
###
### Copyright (C) 1998-2009 R Core Team
### Copyright (C) 1998-2010 R Core Team
###
### This file is part of R.
###
......@@ -430,27 +430,27 @@ AC_ARG_VAR([R_BATCHSAVE],
AC_ARG_VAR([MAIN_CFLAGS],
[additional CFLAGS used when compiling the main binary])
AC_ARG_VAR([SHLIB_CFLAGS],
[additional CFLAGS used when building shared libraries])
[additional CFLAGS used when building shared objects])
AC_ARG_VAR([MAIN_FFLAGS],
[additional FFLAGS used when compiling the main binary])
AC_ARG_VAR([SHLIB_FFLAGS],
[additional FFLAGS used when building shared libraries])
[additional FFLAGS used when building shared objects])
AC_ARG_VAR([MAIN_LD],
[command used to link the main binary])
AC_ARG_VAR([MAIN_LDFLAGS],
[flags which are necessary for loading a main program which
will load shared library modules (DLLs) at runtime])
will load shared objects (DLLs) at runtime])
AC_ARG_VAR([CPICFLAGS],
[special flags for compiling C code to be turned into a
shared library.])
shared object.])
AC_ARG_VAR([FPICFLAGS],
[special flags for compiling Fortran code to be turned into a
shared library.])
shared object.])
AC_ARG_VAR([FCPICFLAGS],
[special flags for compiling Fortran 95 code to be turned into a
shared library.])
shared object.])
AC_ARG_VAR([SHLIB_LD],
[command for linking shared libraries which contain object
[command for linking shared objects which contain object
files from a C or Fortran compiler only])
AC_ARG_VAR([SHLIB_LDFLAGS],
[special flags used by SHLIB_LD])
......@@ -461,14 +461,14 @@ AC_ARG_VAR([DYLIB_LDFLAGS],
[special flags used for make a dynamic library])
AC_ARG_VAR([CXXPICFLAGS],
[special flags for compiling C++ code to be turned into a
shared library])
shared object])
AC_ARG_VAR([SHLIB_CXXLD],
[command for linking shared libraries which contain object
files from a C++ compiler])
[command for linking shared objects which contain object
files from the C++ compiler])
AC_ARG_VAR([SHLIB_CXXLDFLAGS],
[special flags used by SHLIB_CXXLD])
AC_ARG_VAR([SHLIB_FCD],
[command for linking shared libraries which contain object
[command for linking shared objects which contain object
files from the Fortran 95 compiler])
AC_ARG_VAR([SHLIB_FCLDFLAGS],
[special flags used by SHLIB_FCLD])
......@@ -537,6 +537,9 @@ R_PROG_INSTALL
AC_PATH_PROGS(SED, sed, /bin/sed, [/usr/xpg4/bin:$PATH])
## we need an tr that interprets \r for Rdiff
AC_PATH_PROGS(TR, tr, /bin/tr, [/usr/xpg4/bin:$PATH])
## 'which' is not POSIX, and might be a shell builtin or alias
## (but should not be in 'sh')
AC_PATH_PROGS(WHICH, which, which)
## Make
: ${MAKE=make}
AC_SUBST(MAKE)
......@@ -721,20 +724,16 @@ AC_HEADER_SYS_WAIT
## Some of these are also checked for when Autoconf computes the default
## includes.
AC_CHECK_HEADERS(arpa/inet.h dl.h dlfcn.h elf.h fcntl.h floatingpoint.h \
fpu_control.h glob.h grp.h limits.h locale.h \
netdb.h netinet/in.h pwd.h stdbool.h strings.h \
fpu_control.h glob.h grp.h locale.h \
netdb.h netinet/in.h pwd.h strings.h \
sys/param.h sys/select.h sys/socket.h sys/stat.h sys/resource.h \
sys/time.h sys/times.h sys/utsname.h time.h unistd.h)
## </NOTE>
## <NOTE>
## These are C99 headers but some C code (written to work also
## without assuming C99) may need the corresponding conditionals.
AC_CHECK_HEADERS(errno.h inttypes.h stdarg.h stdint.h string.h)
## </NOTE>
## <NOTE>
## src/main/regex.c uses HAVE_LIBINTL_H.
## But then we want full gettext support and AM_GNU_GETTEXT.
## AC_CHECK_HEADERS(libintl.h)
AC_CHECK_HEADERS(errno.h inttypes.h limits.h stdarg.h stdbool.h \
stdint.h string.h)