[openoffice] branch trunk updated: Split up the checks for whether Cygwin's awk, tar, and gunzip are symlinks, so we can tell which of them is actually broken.

[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 6a118d531f Split up the checks for whether Cygwin's awk, tar, and gunzip are symlinks, so we can tell which of them is actually broken.
6a118d531f is described below

commit 6a118d531fc6c4cb8fe9ca6c16b0412adc9a9636
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 20 06:14:25 2023 +0200

    Split up the checks for whether Cygwin's awk, tar, and gunzip are symlinks,
    so we can tell which of them is actually broken.
    
    Patch by: me
---
 main/configure.ac | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/main/configure.ac b/main/configure.ac
index 62cd7932f4..1b9c9c09e2 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1644,8 +1644,18 @@ if test $_os = "WINNT"; then
    dnl ===================================================================
    dnl As long as awk instead of $AWK is used somewhere in the sources,
    dnl check for $AWK and awk. $AWK is pointing to gawk in cygwin.
-      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         AC_MSG_ERROR([$AWK, awk, tar or gunzip is a cygwin symlink!
+      if test -L $AWK -o -L `which awk` ; then
+         AC_MSG_ERROR([$AWK / awk is a cygwin symlink!
+Native Windows programs cannot use cygwin symlinks. Remove the symbolic
+link, and copy the program to the name of the link.])
+      fi
+      if test -L `which tar` ; then
+         AC_MSG_ERROR([tar is a cygwin symlink!
+Native Windows programs cannot use cygwin symlinks. Remove the symbolic
+link, and copy the program to the name of the link.])
+      fi
+      if test -L `which gunzip` ; then
+         AC_MSG_ERROR([gunzip is a cygwin symlink!
 Native Windows programs cannot use cygwin symlinks. Remove the symbolic
 link, and copy the program to the name of the link.])
       fi