From 48a18e5be7d0b46dee4cbe0c29d4d8e7b875d179 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 21 Aug 2024 18:16:07 +0200 Subject: [PATCH] Fix bug GH-15514 (Configure error: genif.sh: syntax error) Autoconf assigns the current suitable shell to SHELL variable. This notably fixes cases on Solaris 10 when using C shell or KornShell where genif.sh: syntax error at line 35 occurs due to using the `sh` command. --- NEWS | 1 + configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 04c850f6c1a..3dfc4308841 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ PHP NEWS . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer). (zeriyoshi) . Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot) + . Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot) - MySQLnd: . Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb, diff --git a/configure.ac b/configure.ac index e01d2da2b69..1142c9459d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1792,10 +1792,10 @@ FEO dnl Run this only when generating all the files. if test -n "\$REDO_ALL"; then echo "creating main/internal_functions.c" - AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c + AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c echo "creating main/internal_functions_cli.c" - AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c + AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c if test "$PHP_SAPI" = "apache2handler"; then if test "$APACHE_VERSION" -ge 2004001; then