Mercurial > hg > release > icedtea-web-1.7
changeset 1538:5ef482e3aa78
* acinclude.m4: Moved windows specific check for JDK on the begging of SYSTEM_JDK part of IT_CHECK_FOR_JDK macro to fix search on windows
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 05 Mar 2019 14:22:47 +0100 |
| parents | 5de5c1d74ffb |
| children | b2c7ba07a660 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 05 14:17:26 2019 +0100 +++ b/ChangeLog Tue Mar 05 14:22:47 2019 +0100 @@ -1,3 +1,8 @@ +2019-03-05 Lars Herschke <lhersch@dssgmbh.de> + + * acinclude.m4: Moved windows specific check for JDK on the begging of SYSTEM_JDK part of IT_CHECK_FOR_JDK macro + to fix search on windows + 2019-03-05 Lars Herschke <lhersch@dssgmbh.de> * Makefile.am: removed dual slash between destdir and modularjdk, included CPPUNIT_FRAMEWORK_CLEAN_IMPL with
--- a/acinclude.m4 Tue Mar 05 14:17:26 2019 +0100 +++ b/acinclude.m4 Tue Mar 05 14:22:47 2019 +0100 @@ -47,6 +47,14 @@ SYSTEM_JDK_DIR= ]) if test -z "${SYSTEM_JDK_DIR}"; then + AM_COND_IF([WINDOWS], [ + # does not work, use which instead + # AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe]) + SYSTEM_JAVA_IN_PATH=$(which javac 2>&AS_MESSAGE_LOG_FD) + if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then + SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH})) + fi + ] , [ for dir in /etc/alternatives/java_sdk \ /usr/lib/jvm/java-1.9.0-openjdk \ /usr/lib/jvm/icedtea9 \ @@ -64,15 +72,8 @@ break fi done + ]) fi - AM_COND_IF([WINDOWS], [ - # does not work, use which instead - # AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe]) - SYSTEM_JAVA_IN_PATH=$(which java 2>&AS_MESSAGE_LOG_FD) - if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then - SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH})) - fi - ]) if ! test -d "${SYSTEM_JDK_DIR}"; then AC_MSG_ERROR("A JDK home directory could not be found. ${SYSTEM_JDK_DIR}") else