WIN always check jdk_home path and content

Change-Id: If13984395051c3e507028312a4106059f3f0bb93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112972
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

configure.ac

@@ -8028,19 +8028,17 @@ if test "$ENABLE_JAVA" != ""; then
             if test -n "$regvalue"; then
                 ver=$regvalue
                 reg_get_value "$WIN_HOST_BITS" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/$ver/JavaHome"
-                reg_jdk_home=$regvalue
-            fi
-
-            if test -f "$reg_jdk_home/lib/jvm.lib" -a -f "$reg_jdk_home/bin/java.exe"; then
-                with_jdk_home="$reg_jdk_home"
-                howfound="found automatically"
-            else
-                AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option pointing to a $WIN_HOST_BITS-bit JDK >= 9])
+                with_jdk_home=$regvalue
             fi
+            howfound="found automatically"
         else
-            test "$build_os" = "cygwin" && with_jdk_home=`win_short_path_for_make "$with_jdk_home"`
+            with_jdk_home=`win_short_path_for_make "$with_jdk_home"`
             howfound="you passed"
         fi
+
+        if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f "$with_jdk_home/bin/java.exe"; then
+            AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 9])
+        fi
     fi
 
     # macOS: /usr/libexec/java_home helps to set the current JDK_HOME. Actually JDK_HOME should NOT be set where java (/usr/bin/java) is located.