>From c9ed8d9a58bae5a90fc1410232354cf8e27e2e3c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 24 Dec 2020 22:13:49 +0100 Subject: [PATCH 1/7] sh-filename: Add support for native Windows. * m4/sh-filename.m4 (gl_SH_FILENAME): Treat native Windows like Cygwin. --- ChangeLog | 5 +++++ m4/sh-filename.m4 | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b05bb3..d93aa47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-12-24 Bruno Haible + + sh-filename: Add support for native Windows. + * m4/sh-filename.m4 (gl_SH_FILENAME): Treat native Windows like Cygwin. + 2020-12-24 Paul Eggert careadlinkat: improve warning line number diff --git a/m4/sh-filename.m4 b/m4/sh-filename.m4 index f7b3154..63bbd67 100644 --- a/m4/sh-filename.m4 +++ b/m4/sh-filename.m4 @@ -1,4 +1,4 @@ -# sh-filename.m4 serial 2 +# sh-filename.m4 serial 3 dnl Copyright (C) 2018-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,8 +10,10 @@ AC_DEFUN([gl_SH_FILENAME], [ AH_VERBATIM([SH_FILENAME], [/* File name of the Bourne shell. */ -#if defined __CYGWIN__ || defined __ANDROID__ +#if (defined _WIN32 && !defined __CYGWIN__) || defined __CYGWIN__ || defined __ANDROID__ /* Omit the directory part because + - For native Windows programs in a Cygwin environment, the Cygwin mounts + are not visible. - For 32-bit Cygwin programs in a 64-bit Cygwin environment, the Cygwin mounts are not visible. - On Android, /bin/sh does not exist. It's /system/bin/sh instead. */ -- 2.7.4