This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f2d71820096f6747573beca9ec52fd1ab89d9da8 Author: Damjan Jovanovic <[email protected]> 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 (cherry picked from commit 6a118d531fc6c4cb8fe9ca6c16b0412adc9a9636) --- main/configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main/configure.ac b/main/configure.ac index 7dffca3682..44a4448349 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -1665,8 +1665,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
