# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1551792165 -3600
# Node ID 31a2bdd10d05462f7cf8be1b9b48c8ca9a24880e
# Parent  6ae6afda9284b6af860e008e97086a3c79c2e57a
* 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

diff -r 6ae6afda9284 -r 31a2bdd10d05 ChangeLog
--- a/ChangeLog	Tue Mar 05 14:17:24 2019 +0100
+++ b/ChangeLog	Tue Mar 05 14:22:45 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
diff -r 6ae6afda9284 -r 31a2bdd10d05 acinclude.m4
--- a/acinclude.m4	Tue Mar 05 14:17:24 2019 +0100
+++ b/acinclude.m4	Tue Mar 05 14:22:45 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