The R Project SVN R

Rev

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

Rev 41576 Rev 41594
Line 104... Line 104...
104 
  fi
 104 
  fi
105 
  acx_jc_result=
 105 
  acx_jc_result=
106 
fi])
 106 
fi])
107 
 
 107 
 
108 
if test ${r_cv_java_works} = yes; then
 108 
if test ${r_cv_java_works} = yes; then
- 
 
 109 
  AC_CACHE_CHECK([Java environment], [r_cv_java_home], [
- 
 
 110 
    ## find JAVA_HOME from Java itself unless specified
- 
 
 111 
    if test -z "${JAVA_HOME}" ; then
- 
 
 112 
      R_RUN_JAVA(JAVA_HOME,[-classpath ${getsp_cp} getsp java.home])
- 
 
 113 
    fi
- 
 
 114 
    r_cv_java_home="${JAVA_HOME}"
- 
 
 115 
  ])
- 
 
 116 
  JAVA_HOME="${r_cv_java_home}"
- 
 
 117 
 
- 
 
 118 
  # we have Java support, detect flags
- 
 
 119 
  if test -n "${JAVA_HOME}"; then
- 
 
 120 
    # find out whether all settings are already cached
- 
 
 121 
    r_java_settings_cached=yes
- 
 
 122 
    AC_MSG_CHECKING([for cached Java settings])
- 
 
 123 
    AC_CACHE_VAL([r_cv_cache_java_flags], [
- 
 
 124 
      r_cv_cache_java_flags=yes
- 
 
 125 
      r_java_settings_cached=no])
- 
 
 126 
    AC_MSG_RESULT([${r_java_settings_cached}])
- 
 
 127 
    # if so, fetch them from the cache
- 
 
 128 
    if test "${r_java_settings_cached}" = yes; then
- 
 
 129 
      AC_CACHE_CHECK([JAVA_LIBS], [r_cv_JAVA_LIBS])
- 
 
 130 
      JAVA_LIBS0="${r_cv_JAVA_LIBS}"
- 
 
 131 
      AC_CACHE_CHECK([JAVA_CPPFLAGS],[r_cv_JAVA_CPPFLAGS])
- 
 
 132 
      JAVA_CPPFLAGS0="${r_cv_JAVA_CPPFLAGS}"
- 
 
 133 
      AC_CACHE_CHECK([JAVA_LD_LIBRARY_PATH],[r_cv_JAVA_LD_LIBRARY_PATH])
- 
 
 134 
      JAVA_LD_LIBRARY_PATH="${r_cv_JAVA_LD_LIBRARY_PATH}"
- 
 
 135 
    else
- 
 
 136 
    # otherwise detect all Java-relevant flags
109 
 
 137 
 
110 
  ## we cannot cache this part without caching JAVA_HOME
 - 
 
111 
  AC_MSG_CHECKING([for Java environment])
 - 
 
112 
  r_cv_java_env="not found"
 - 
 
113 
  ## find JAVA_HOME from Java itself unless specified
 - 
 
114 
  if test -z "${JAVA_HOME}" ; then
 - 
 
115 
    R_RUN_JAVA(JAVA_HOME,[-classpath ${getsp_cp} getsp java.home])
 - 
 
116 
  fi
 - 
 
117 
 
 - 
 
118 
  ## the availability of JAVA_HOME will tell us whether it's supported
 - 
 
119 
  if test -n "${JAVA_HOME}" ; then
 - 
 
120 
    r_cv_java_env="in ${JAVA_HOME}"
 - 
 
121 
  fi
 - 
 
122 
  AC_MSG_RESULT([$r_cv_java_env])
 - 
 
123 
 
 - 
 
124 
  if test "$r_cv_java_env" != "not found"; then
- 
 
125 
    : ${JAVA_LIBS=~autodetect~}
 138 
    : ${JAVA_LIBS=~autodetect~}
126 
    : ${JAVA_CPPFLAGS=~autodetect~}
 139 
    : ${JAVA_CPPFLAGS=~autodetect~}
127 
    : ${JAVA_LD_LIBRARY_PATH=~autodetect~}
 140 
    : ${JAVA_LD_LIBRARY_PATH=~autodetect~}
128 
    custom_JAVA_LIBS="${JAVA_LIBS}"
 141 
    custom_JAVA_LIBS="${JAVA_LIBS}"
129 
    custom_JAVA_CPPFLAGS="${JAVA_CPPFLAGS}"
 142 
    custom_JAVA_CPPFLAGS="${JAVA_CPPFLAGS}"
Line 231... Line 244...
231 
],[r_cv_jni="yes (with pthreads)"],[r_cv_jni="no"])])
 244 
],[r_cv_jni="yes (with pthreads)"],[r_cv_jni="no"])])
232 
    LIBS="${j_save_LIBS}"
 245 
    LIBS="${j_save_LIBS}"
233 
    CPPFLAGS="${j_save_CPPF}"
 246 
    CPPFLAGS="${j_save_CPPF}"
234 
])
 247 
])
235 
    ##AC_MSG_RESULT([$r_cv_jni])
 248 
    ##AC_MSG_RESULT([$r_cv_jni])
236 
    if test "$r_cv_jni"="yes (with pthreads)"; then
 249 
    if test "${r_cv_jni}" = "yes (with pthreads)"; then
237 
      JAVA_LIBS0="${JAVA_LIBS0} -lpthread"
 250 
      JAVA_LIBS0="${JAVA_LIBS0} -lpthread"
238 
    fi
 251 
    fi
- 
 
 252 
 
- 
 
 253 
    # cache all detected flags
- 
 
 254 
      AC_CACHE_VAL([r_cv_JAVA_LIBS],[r_cv_JAVA_LIBS="${JAVA_LIBS0}"])
- 
 
 255 
      AC_CACHE_VAL([r_cv_JAVA_CPPFLAGS],[r_cv_JAVA_CPPFLAGS="${JAVA_CPPFLAGS0}"])
- 
 
 256 
      AC_CACHE_VAL([r_cv_JAVA_LD_LIBRARY_PATH],[r_cv_JAVA_LD_LIBRARY_PATH="${JAVA_LD_LIBRARY_PATH}"])
- 
 
 257 
    fi # cached flags
- 
 
 258 
 
239 
    have_java=yes
 259 
    have_java=yes
240 
  fi
 260 
  fi
241 
else  ## not r_cv_java_works
 261 
else  ## not r_cv_java_works
242 
  JAVA=
 262 
  JAVA=
243 
  JAVA_HOME=
 263 
  JAVA_HOME=
244 
fi
 264 
fi
245 
 
 265 
 
246 
AC_SUBST(JAVA_HOME)
 266 
## AC_SUBST(JAVA_HOME) # not needed? is precious now
247 
AC_SUBST(JAVA)
 267 
AC_SUBST(JAVA)
248 
AC_SUBST(JAVAC)
 268 
AC_SUBST(JAVAC)
249 
AC_SUBST(JAVAH)
 269 
AC_SUBST(JAVAH)
250 
AC_SUBST(JAR)
 270 
AC_SUBST(JAR)
251 
AC_SUBST(JAVA_LD_LIBRARY_PATH)
 271 
AC_SUBST(JAVA_LD_LIBRARY_PATH)