-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Autotools: Move Apache warning to SAPI's config.m4 #14872
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This uses AC_CONFIG_COMMANDS macro to conditionally output the warning message at the end of configure phase if non-threaded Apache installation has been found and PHP is built without --enable-zts. Variables set in the 2nd argument (init-cmds) are for the command invocation scope as the first argument doesn't have any knowledge of configure variables as described in the Autoconf docs. This is moved as it is related only to apache2handler SAPI and also now warning is displayed a bit nicer at the end of the configure phase after files are generated. This also enables outputting warning when using config.status script.
8acf72b
to
e1180f0
Compare
Girgias
approved these changes
Jul 8, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes sense to me
@petk This breaks my Apache 2 build, configure now fails and I get the following message at the bottom:
|
Note that Apache 2 SAPI is not tested in CI, so we should be extra careful when applying patches here. |
petk
added a commit
to petk/php-src
that referenced
this pull request
Jul 11, 2024
The init-cmds argument is appended to the config.status script with cat command and variables $var are replaced during the cat step to their values, so quoting these values fixes the syntax errors. Fixes report in phpGH-14872
Thanks for fixing it fast! |
petk
added a commit
that referenced
this pull request
Jul 12, 2024
The init-cmds argument is appended to the config.status script with cat command and variables $var are replaced during the cat step to their values, so quoting these values fixes the syntax errors. * Simplify threaded Apache build detection Instead of checking for entire "grepped" string, this only checks for yes|no values instead. * Redirect the standard output and standard error The "grep -q" is not portable according to docs so this redirects the output and checks the exit status. Fixes report in GH-14872
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This uses AC_CONFIG_COMMANDS macro to conditionally output the warning message at the end of configure phase if non-threaded Apache installation has been found and PHP is built without --enable-zts.
Variables set in the 2nd argument (init-cmds) are for the command invocation scope as the first argument doesn't have any knowledge of configure variables as described in the Autoconf docs.
This is moved as it is related only to apache2handler SAPI and also now warning is displayed a bit nicer at the end of the configure phase after files are generated. This also enables outputting warning when using config.status script.
Before:
After: