Autotools: Obsolete PHP_TEST_BUILD, PHP_BUILD_THREAD_SAFE, and PHP_DEF_HAVE (#15802)

The PHP_BUILD_THREAD_SAFE macro is a simple wrapper around setting the
enable_zts variable and can't

Autotools: Obsolete PHP_TEST_BUILD, PHP_BUILD_THREAD_SAFE, and PHP_DEF_HAVE (#15802)

The PHP_BUILD_THREAD_SAFE macro is a simple wrapper around setting the
enable_zts variable and can't be used in PHP extensions realistically.

The PHP_TEST_BUILD macro might produce warnings on certain compiler
configurations and default AC_* macros like AC_LINK_IFELSE,
AC_CHECK_LIB, or AC_CHECK_FUNC are better suited for such checks. Also,
a quick browse through the open-source PHP extensions doesn't find
usages of this macro except in imap extension where patch is was already
sent:
https://github.com/php/pecl-mail-imap/pull/11

PHP_DEF_HAVE is a wrapper around AC_DEFINE and using AC_DEFINE_UNQUOTED
and AS_TR_CPP are better suited for this task where also help text can
be passed. Usages in the open source PHP extensions have been checked and
patches sent where found.

show more ...

Autotools: Check Apache version with apxs and HTTPD_VERSION variable (#15476)

The apxs -q HTTPD_VERSION variable is available since Apache 2.4.17.
This change obsoletes the PHP_AP_EXTRAC

Autotools: Check Apache version with apxs and HTTPD_VERSION variable (#15476)

The apxs -q HTTPD_VERSION variable is available since Apache 2.4.17.
This change obsoletes the PHP_AP_EXTRACT_VERSION macro and checks the
version in the config.m4 file directly. Version is checked against the
dotted format instead of the version number.

show more ...

Autotools: Normalize flags arguments (#15671)

This is a follow up of 7edb9a07d750a92ceea9371588f10ff2f05df40f that
provides passing compilation options to PHP_NEW_EXTENSION,
PHP_ADD_

Autotools: Normalize flags arguments (#15671)

This is a follow up of 7edb9a07d750a92ceea9371588f10ff2f05df40f that
provides passing compilation options to PHP_NEW_EXTENSION,
PHP_ADD_SOURCES, PHP_ADD_SOURCES_X, and PHP_SELECT_SAPI as a
blank-or-newline-separated argument.

show more ...

Autotools: Replace obsolete backticks with $(...) in apache2handler (#15454)

Obsolete backticks can be replaced with the recommended $(...) (on
shells where the "newer" style still doesn

Autotools: Replace obsolete backticks with $(...) in apache2handler (#15454)

Obsolete backticks can be replaced with the recommended $(...) (on
shells where the "newer" style still doesn't work, for example, on
Solaris 10 default shell, Autoconf takes care of that by re-executing
the script itself).

show more ...

Autotools: Remove redundant SAPI_SHARED assignment (#15453)

When the target system is Darwin, the SAPI_SHARED is already set to
libs/libphp.so (instead of libs/libphp.dylib) in configure

Autotools: Remove redundant SAPI_SHARED assignment (#15453)

When the target system is Darwin, the SAPI_SHARED is already set to
libs/libphp.so (instead of libs/libphp.dylib) in configure.ac and in
php.m4 via PHP_SHLIB_SUFFIX_NAMES.

show more ...

Autotools: Simplify PHP_SELECT_SAPI in apache2handler SAPI (#15444)

Autotools: Use AS_* macros in apache2handler SAPI (#15423)

Autotools: Wrap long texts with m4_text_wrap (#15368)

The m4_text_wrap macro wraps the text into a single space separated
string which is wrapped to not exceed the line lenght of 79 char

Autotools: Wrap long texts with m4_text_wrap (#15368)

The m4_text_wrap macro wraps the text into a single space separated
string which is wrapped to not exceed the line lenght of 79 characters
by default.

show more ...

Autotools: Quote and fix PHP_SELECT_SAPI arguments (#15118)

This macro once had also the 5th argument (the build target), which was
removed via 2a6da0f24cbd04361c044c1cdf6b6b30d08a245e.

Autotools: Quote and fix PHP_SELECT_SAPI arguments (#15118)

This macro once had also the 5th argument (the build target), which was
removed via 2a6da0f24cbd04361c044c1cdf6b6b30d08a245e. This quotes all
PHP_SELECT_SAPI arguments and removes the redundant ones. The basic
macro usage help text is moved to the macros section from the obsolete
docs file.

show more ...

Autotools: Quote macro arguments

- PHP_EXPAND_PATH
- PHP_LIBGCC_LIBPATH
- PHP_OUTPUT
- PHP_REMOVE_USR_LIB

Autotools: Expand m4_normalize sooner (#15018)

Quoted m4_normalize will expand and change its argument later in the
macro call when M4 is processing the *.m4 sources. Without quotes the

Autotools: Expand m4_normalize sooner (#15018)

Quoted m4_normalize will expand and change its argument later in the
macro call when M4 is processing the *.m4 sources. Without quotes the
already normalized string is passed to the macro directly. In these
specific cases generated configure script is the same. This is more for
consistency to have this synced and not repeat the pattern too much
in the future when copy/pasting. Note, that many AC_* macros require
similar behavior already (for example, AC_CHECK_FUNCS.)

show more ...

Autotools: Fix config.status script syntax (#14929)

The init-cmds argument is appended to the config.status script with cat
command and variables $var are replaced during the cat step to

Autotools: Fix config.status script syntax (#14929)

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

show more ...

Autotools: Move Apache warning to SAPI's config.m4 (#14872)

This uses AC_CONFIG_COMMANDS macro to conditionally output the warning
message at the end of configure phase if non-threaded A

Autotools: Move Apache warning to SAPI's config.m4 (#14872)

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.

show more ...

Check Apache HTTP Server command-line utility (#14173)

The Apache HTTP server command-line tool (/usr/sbin/apache2) might be
part of a separate package, such as apache2-bin or similar. I

Check Apache HTTP Server command-line utility (#14173)

The Apache HTTP server command-line tool (/usr/sbin/apache2) might be
part of a separate package, such as apache2-bin or similar. If not
installed, the configure script can still find the apxs tool, but
previously didn't check for the HTTP server tool separately. Otherwise,
configure syntax errors (integer expression expected) are thrown when
checking for the Apache version.

show more ...

Fix AS_VAR_* checks (#14868)

AS_VAR_SET_IF doesn't behave the same as "test -n" and/or "test -z",
which becomes an issue for Apache's ZTS automatic enabling and CFLAGS
edge case wher

Fix AS_VAR_* checks (#14868)

AS_VAR_SET_IF doesn't behave the same as "test -n" and/or "test -z",
which becomes an issue for Apache's ZTS automatic enabling and CFLAGS
edge case where it would be explicitly set to empty value. It is safer
to use AS_VAR_IF instead of AS_VAR_SET_IF in these cases.

show more ...

Remove support for EOL Apache 2.0 and 2.2 in favor of 2.4+ (#14664)

Apache 2.2 has been marked as EOL in December 2017 and doesn't receive
security patches any longer. Also, most *nix di

Remove support for EOL Apache 2.0 and 2.2 in favor of 2.4+ (#14664)

Apache 2.2 has been marked as EOL in December 2017 and doesn't receive
security patches any longer. Also, most *nix distributions and packages
mostly support 2.4 as minimum by now.

On Windows, this removes the configure option --enable-apache2-2handler
and merges the --enable-apache2handler and --enable-apache2-4handler
into a single option with favoring the --enable-apache2handler.

- The upstream MODULE_MAGIC_NUMBER is deprecated in favor of
MODULE_MAGIC_NUMBER_MAJOR in apache2/ap_mmn.h
- The initial upstream MODULE_MAGIC_NUMBER_MAJOR was 20111025 in Apache
2.4.0
- The upstream APLOG_USE_MODULE is always available since Apache 2.3.6
- The upstream CORE_PRIVATE is unnecessary and ignored since Apache
2.4.0

See:
https://forum.apachehaus.com/news-general-discussion/apache-2-2-users-your-time-is-running-out/

Discussion: https://news-web.php.net/php.internals/124067

show more ...

Autotools: Simplify SAPI configure log check messages (#14764)

The PHP_ARG_ENABLE and PHP_ARG_WITH 2nd argument is the check message in
the configure log output.

Autotools: Sync PHP_SUBST in sapi (#14753)

- Arguments quoted
- Redundant comments removed (some basic help info is in the
build/php.m4)
- APXS variable as such isn't used in t

Autotools: Sync PHP_SUBST in sapi (#14753)

- Arguments quoted
- Redundant comments removed (some basic help info is in the
build/php.m4)
- APXS variable as such isn't used in the generated Makefile, the path
to the apxs tool is inserted during the configure step directly

show more ...

Remove unused variable APXS_BINDIR

Last usage removed via d3bc8beb4ff9e00c3742ada32788239c3f7988e0.

Fixed bug #79737 (Building embed as static fails during install step).

Remove some more Apache 1 left overs

- warning in configure.ac is relevant for the sapi/apache
- errors output redirected to /dev/null when checking Apache version

Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
favor of the shell comment characte

Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now

show more ...

Add AS_HELP_STRING to *nix build configure options

The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not

Add AS_HELP_STRING to *nix build configure options

The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.

[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings

show more ...

Remove major version from apache module

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files. All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.

show more ...