The R Project SVN R

Rev

Rev 84173 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 84173 Rev 88154
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: 84173 $'
 12 
revision='$Rev: 88154 $'
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 220... Line 220...
220 
		has_libjvm=yes
 220 
		has_libjvm=yes
221 
		java_library_path="${dir}"
 221 
		java_library_path="${dir}"
222 
		break
 222 
		break
223 
	    fi
 223 
	    fi
224 
	done
 224 
	done
- 
 
 225 
	IFS=${save_IFS}
225 
	# Then try some heuristics using sun.boot.library.path
 226 
	# Then try some heuristics using sun.boot.library.path
226 
	if test ${has_libjvm} = no; then
 227 
	if test ${has_libjvm} = no; then
227 
	    boot_path=`"$JAVA" -classpath "${tools_classpath}" getsp sun.boot.library.path| ${SED-sed} -e 's/:$//' -e 's/^://'`
 228 
	    boot_path=`"$JAVA" -classpath "${tools_classpath}" getsp sun.boot.library.path| ${SED-sed} -e 's/:$//' -e 's/^://'`
228 
	    if test -n "${boot_path}"; then
 229 
	    if test -n "${boot_path}"; then
229 
		for dir in "${boot_path}" "${boot_path}/client" "${boot_path}/server"; do
 230 
		# libjvm is typically in the variant subdirectory. For variants
- 
 
 231 
		# see make/autoconf/hotspot.m4 in JDK sources:
- 
 
 232 
		VALID_JVM_VARIANTS="server client minimal core zero custom"
- 
 
 233 
		for dir in '' ${VALID_JVM_VARIANTS}; do
230 
		    if test -f "$dir/libjvm${DYLIB_EXT}"; then
 234 
		    if test -f "${boot_path}/$dir/libjvm${DYLIB_EXT}"; then
231 
			has_libjvm=yes
 235 
			has_libjvm=yes
232 
			java_library_path="${dir}"
 236 
			java_library_path="${boot_path}/$dir"
233 
			break
 237 
			break
234 
		    fi
 238 
		    fi
235 
		done
 239 
		done
236 
	    fi
 240 
	    fi
237 
	fi
241 
	fi
238 
	IFS=${save_IFS}
 - 
 
239 
	# replace occurrences of JAVA_HOME with $(JAVA_HOME)
 242 
	# replace occurrences of JAVA_HOME with $(JAVA_HOME)
240 
	# If JAVA_HOME was a link, it will be the canonical path we
 243 
	# If JAVA_HOME was a link, it will be the canonical path we
241 
	# want to replace.  We need working realpath to determine what that is.
 244 
	# want to replace.  We need working realpath to determine what that is.
242 
	if @REALPATH@ "${JAVA_HOME}" >/dev/null 2>&1; then
 245 
	if @REALPATH@ "${JAVA_HOME}" >/dev/null 2>&1; then
243 
            java_home=`@REALPATH@ "${JAVA_HOME}"`
 246 
            java_home=`@REALPATH@ "${JAVA_HOME}"`