[openoffice] branch trunk updated: Append ".exe" to "javac" and "javadoc" detection on Windows too, just like we do on OS/2.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new fa0b85184c Append ".exe" to "javac" and "javadoc" detection on Windows too, just like we do on OS/2.
fa0b85184c is described below

commit fa0b85184c7d01f9b385b47b3b7416bf2a03a533
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Mar 1 05:45:16 2023 +0200

    Append ".exe" to "javac" and "javadoc" detection on Windows too,
    just like we do on OS/2.
    
    Patch by: me
---
 main/configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/configure.ac b/main/configure.ac
index 1b9c9c09e2..442c53f5d6 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3126,7 +3126,7 @@ if test "$SOLAR_JAVA" != ""; then
     else
         javacompiler="javac"
     fi
-    if test "$_os" = "OS2"; then
+    if test "$_os" = "WNT" -o "$_os" = "OS2"; then
       if test x`echo "$javacompiler" | $GREP -i '\.exe$'` = x; then
           javacompiler="${javacompiler}.exe"
       fi
@@ -3185,7 +3185,7 @@ if test "$SOLAR_JAVA" != ""; then
         AC_PATH_PROG(JAVADOC, javadoc)
     else
         _javadoc_path="$with_jdk_home/bin/javadoc"
-        if test "$_os" = "OS2"; then
+        if test "$_os" = "WNT" -o "$_os" = "OS2"; then
           if test x`echo "$_javadoc_path" | $GREP -i '\.exe$'` = x; then
               _javadoc_path="${_javadoc_path}.exe"
           fi