diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:43:03 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:43:03 +0200 |
| commit | 75fb74860da7decd94432a4d211795310308a4a8 (patch) | |
| tree | a4a7a4755150cf43bca6c4f7d075ce67e1c4ade2 /sapi/apache2handler | |
| parent | e96c776bd5d03d3042e9b1c91d395ebf81741540 (diff) | |
| download | php-git-75fb74860da7decd94432a4d211795310308a4a8.tar.gz | |
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
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.m4 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index d1d92db21f..8f757894c8 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -1,5 +1,3 @@ -dnl config.m4 for sapi apache2handler - PHP_ARG_WITH([apxs2],, [AS_HELP_STRING([[--with-apxs2[=FILE]]], [Build shared Apache 2.0 Handler module. FILE is the optional pathname to @@ -42,7 +40,7 @@ if test "$PHP_APXS2" != "no"; then APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` - # Pick up ap[ru]-N-config if using httpd >=2.1 + dnl Pick up ap[ru]-N-config if using httpd >=2.1 APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null || echo $APR_BINDIR/apr-config` APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null || @@ -59,7 +57,7 @@ if test "$PHP_APXS2" != "no"; then APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" - # Test that we're trying to configure with apache 2.x + dnl Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test "$APACHE_VERSION" -le 2000000; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) @@ -88,10 +86,9 @@ if test "$PHP_APXS2" != "no"; then INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) - dnl When using bundles on Darwin, we must resolve all symbols. However, - dnl the linker does not recursively look at the bundle loader and - dnl pull in its dependencies. Therefore, we must pull in the APR - dnl and APR-util libraries. + dnl When using bundles on Darwin, we must resolve all symbols. However, the + dnl linker does not recursively look at the bundle loader and pull in its + dnl dependencies. Therefore, we must pull in the APR and APR-util libraries. if test -x "$APR_CONFIG"; then MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`" fi |