author | Phil Ringnalda <philringnalda@gmail.com> |
Sat, 09 Apr 2011 15:48:14 -0700 | |
changeset 67748 | b05724577538183844f612eff15cfd6c07813811 |
parent 67747 | 00b34481041ac7ba6fb5b75dee561e2306e159f8 |
child 67749 | 18db426b1879162867bbb83579a145e90cdde042 |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bsmedberg |
bugs | 648695 |
milestone | 2.2a1pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -6209,16 +6209,24 @@ dnl ==================================== dnl = Universalchardet dnl ======================================================== MOZ_ARG_DISABLE_BOOL(universalchardet, [ --disable-universalchardet Disable universal encoding detection], MOZ_UNIVERSALCHARDET=, MOZ_UNIVERSALCHARDET=1 ) +if test -n "${JAVA_BIN_PATH}"; then + dnl Look for javac and jar in the specified path. + JAVA_PATH="$JAVA_BIN_PATH" +else + dnl No path specified, so look for javac and jar in $JAVA_HOME & $PATH. + JAVA_PATH="$JAVA_HOME/bin:$PATH" +fi + MOZ_PATH_PROG(JAVA, java, :, [$JAVA_PATH]) MOZ_PATH_PROG(JAVAC, javac, :, [$JAVA_PATH]) MOZ_PATH_PROG(JAR, jar, :, [$JAVA_PATH]) if test -n "${JAVA_BIN_PATH}" -o "$OS_TARGET" = Android; then if test -z "$JAVA" -o "$JAVA" = ":" -o -z "$JAVAC" -o "$JAVAC" = ":" -o -z "$JAR" -o "$JAR" = ":"; then AC_MSG_ERROR([The programs java, javac and jar were not found. Set \$JAVA_HOME to your java sdk directory or use --with-java-bin-path={java-bin-dir}]) fi