Skip to content

Commit 48a18e5

Browse files
committed
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.
1 parent 63841ba commit 48a18e5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ PHP NEWS
66
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
77
(zeriyoshi)
88
. Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
9+
. Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot)
910

1011
- MySQLnd:
1112
. Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1792,10 +1792,10 @@ FEO
17921792
dnl Run this only when generating all the files.
17931793
if test -n "\$REDO_ALL"; then
17941794
echo "creating main/internal_functions.c"
1795-
AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
1795+
AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
17961796
17971797
echo "creating main/internal_functions_cli.c"
1798-
AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
1798+
AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
17991799
18001800
if test "$PHP_SAPI" = "apache2handler"; then
18011801
if test "$APACHE_VERSION" -ge 2004001; then

0 commit comments

Comments
 (0)