The R Project SVN R

Rev

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

Rev 42305 Rev 43659
Line 88... Line 88...
88 
    fi
 88 
    fi
89 
  fi
 89 
  fi
90 
  rm -rf A.java A.class
 90 
  rm -rf A.java A.class
91 
fi])
 91 
fi])
92 
 
 92 
 
- 
 
 93 
AC_CACHE_CHECK([whether Java compiler works for version 1.4], [r_cv_javac14_works],
- 
 
 94 
[r_cv_javac14_works=no
- 
 
 95 
if test "${r_cv_javac_works}" = yes; then
- 
 
 96 
  rm -f A.java A.class
- 
 
 97 
  echo "public class A { }" > A.java
- 
 
 98 
  if "${JAVAC}" -source 1.4 -target 1.4 A.java 2>&AS_MESSAGE_LOG_FD; then
- 
 
 99 
    if test -e A.class; then
- 
 
 100 
      r_cv_javac14_works=yes
- 
 
 101 
    fi
- 
 
 102 
  fi
- 
 
 103 
  rm -rf A.java A.class
- 
 
 104 
fi
- 
 
 105 
])
- 
 
 106 
 
- 
 
 107 
if test "${r_cv_javac14_works}" = yes; then
- 
 
 108 
  JAVAC14="${JAVAC} -source 1.4 -target 1.4"
- 
 
 109 
fi
- 
 
 110 
AM_CONDITIONAL(BUILD_JAVA14, [test "x${r_cv_javac14_works}" = xyes])
- 
 
 111 
 
93 
## this is where our test-class lives (in tools directory)
 112 
## this is where our test-class lives (in tools directory)
94 
getsp_cp=${ac_aux_dir}
 113 
getsp_cp=${ac_aux_dir}
95 
 
 114 
 
96 
AC_CACHE_CHECK([whether Java interpreter works], [r_cv_java_works],
 115 
AC_CACHE_CHECK([whether Java interpreter works], [r_cv_java_works],
97 
[r_cv_java_works=no
 116 
[r_cv_java_works=no
Line 262... Line 281...
262 
fi
 281 
fi
263 
 
 282 
 
264 
## AC_SUBST(JAVA_HOME) # not needed? is precious now
 283 
## AC_SUBST(JAVA_HOME) # not needed? is precious now
265 
AC_SUBST(JAVA)
 284 
AC_SUBST(JAVA)
266 
AC_SUBST(JAVAC)
 285 
AC_SUBST(JAVAC)
- 
 
 286 
AC_SUBST(JAVAC14)
267 
AC_SUBST(JAVAH)
 287 
AC_SUBST(JAVAH)
268 
AC_SUBST(JAR)
 288 
AC_SUBST(JAR)
269 
AC_SUBST(JAVA_LD_LIBRARY_PATH)
 289 
AC_SUBST(JAVA_LD_LIBRARY_PATH)
270 
AC_SUBST(JAVA_LIBS0)
 290 
AC_SUBST(JAVA_LIBS0)
271 
AC_SUBST(JAVA_CPPFLAGS0)
 291 
AC_SUBST(JAVA_CPPFLAGS0)