From 3b5f963421b907fb6d1f1b6b3210776093f00576 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Jan 2019 15:40:31 +0100 Subject: [PATCH] sh-filename: Add support for Android 4.3. * m4/sh-filename.m4 (gl_SH_FILENAME): Set to "sh" on Android. --- ChangeLog | 5 +++++ m4/sh-filename.m4 | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fb579f59c..bf405663ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-01-26 Bruno Haible + + sh-filename: Add support for Android 4.3. + * m4/sh-filename.m4 (gl_SH_FILENAME): Set to "sh" on Android. + 2019-01-26 Bruno Haible ptsname_r: Work around bug on Android 4.3. diff --git a/m4/sh-filename.m4 b/m4/sh-filename.m4 index 3e7fe754e6..dc5f26d49b 100644 --- a/m4/sh-filename.m4 +++ b/m4/sh-filename.m4 @@ -1,4 +1,4 @@ -# sh-filename.m4 serial 1 +# sh-filename.m4 serial 2 dnl Copyright (C) 2018-2019 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,9 +10,11 @@ AC_DEFUN([gl_SH_FILENAME], [ AH_VERBATIM([SH_FILENAME], [/* File name of the Bourne shell. */ -#if defined __CYGWIN__ -/* Omit the directory part because for 32-bit Cygwin programs in a - 64-bit Cygwin environment, the Cygwin mounts are not visible. */ +#if defined __CYGWIN__ || defined __ANDROID__ +/* Omit the directory part because + - 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. */ # define BOURNE_SHELL "sh" #else # define BOURNE_SHELL "/bin/sh" -- 2.39.5