The R Project SVN R

Rev

Rev 74361 | Rev 81152 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 74361 Rev 77228
Line 7... Line 7...
7 
. "${R_HOME}/etc${R_ARCH}/javaconf"
 7 
. "${R_HOME}/etc${R_ARCH}/javaconf"
8 
 
 8 
 
9 
DYLIB_EXT=`${R_HOME}/bin/R CMD config DYLIB_EXT`
 9 
DYLIB_EXT=`${R_HOME}/bin/R CMD config DYLIB_EXT`
10 
tools_classpath=${R_SHARE_DIR}/java
 10 
tools_classpath=${R_SHARE_DIR}/java
11 
 
 11 
 
12 
revision='$Rev: 74361 $'
 12 
revision='$Rev: 77228 $'
13 
version=`set - ${revision}; echo ${2}`
 13 
version=`set - ${revision}; echo ${2}`
14 
version="R Java configurator: ${R_VERSION} (r${version})
 14 
version="R Java configurator: ${R_VERSION} (r${version})
15 
 
 15 
 
16 
Copyright (C) 2002-2018 The R Core Team.
 16 
Copyright (C) 2002-2018 The R Core Team.
17 
This is free software; see the GNU General Public License version 2
 17 
This is free software; see the GNU General Public License version 2
Line 265... Line 265...
265 
        if test -n "${jinc}"; then
 265 
        if test -n "${jinc}"; then
266 
           JAVA_CPPFLAGS="-I${jinc}"
 266 
           JAVA_CPPFLAGS="-I${jinc}"
267 
           jmdinc=''
 267 
           jmdinc=''
268 
           jmdirs=''
 268 
           jmdirs=''
269 
	   ## we are not in configure, so we need to find the OS from R
 269 
	   ## we are not in configure, so we need to find the OS from R
270 
	   host_os=`echo 'cat(R.version$os)'|${R_HOME}/bin/R --vanilla --slave 2>/dev/null`
 270 
	   host_os=`echo 'cat(R.version$os)'|${R_HOME}/bin/R --vanilla --no-echo 2>/dev/null`
271 
           ## put the most probable locations for each system in the first place
 271 
           ## put the most probable locations for each system in the first place
272 
           case "${host_os}" in
 272 
           case "${host_os}" in
273 
             darwin*)  jmdirs=darwin;;
 273 
             darwin*)  jmdirs=darwin;;
274 
             linux*)   jmdirs=linux;;
 274 
             linux*)   jmdirs=linux;;
275 
             bsdi*)    jmdirs=bsdos;;
 275 
             bsdi*)    jmdirs=bsdos;;