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 /scripts | |
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 'scripts')
-rw-r--r-- | scripts/phpize.m4 | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index bcd66df6f3..880309bce7 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -17,7 +17,6 @@ AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice) -dnl AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl AC_DEFUN([PHP_EXT_DIR],[""])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl @@ -26,7 +25,6 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[ ext_shared=yes test "[$]$1" = "no" && $1=yes ])dnl -dnl test -z "$CFLAGS" && auto_cflags=1 @@ -38,7 +36,7 @@ AC_PROG_CC([cc gcc]) PHP_DETECT_ICC PHP_DETECT_SUNCC -dnl Support systems with system libraries in e.g. /usr/lib64 +dnl Support systems with system libraries in e.g. /usr/lib64. PHP_ARG_WITH([libdir], [for system library directory], [AS_HELP_STRING([--with-libdir=NAME], @@ -49,14 +47,14 @@ PHP_ARG_WITH([libdir], PHP_RUNPATH_SWITCH PHP_SHLIB_SUFFIX_NAMES -dnl Find php-config script +dnl Find php-config script. PHP_ARG_WITH([php-config],, [AS_HELP_STRING([--with-php-config=PATH], [Path to php-config [php-config]])], [php-config], [no]) -dnl For BC +dnl For BC. PHP_CONFIG=$PHP_PHP_CONFIG prefix=`$PHP_CONFIG --prefix 2>/dev/null` phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null` @@ -80,7 +78,7 @@ AC_MSG_RESULT([$EXTENSION_DIR]) AC_MSG_CHECKING([for PHP installed headers prefix]) AC_MSG_RESULT([$phpincludedir]) -dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS +dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS. AC_MSG_CHECKING([if debug is enabled]) old_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$phpincludedir" @@ -113,11 +111,11 @@ php_zts_is_enabled CPPFLAGS=$old_CPPFLAGS AC_MSG_RESULT([$PHP_THREAD_SAFETY]) -dnl Support for building and testing Zend extensions +dnl Support for building and testing Zend extensions. ZEND_EXT_TYPE="zend_extension" PHP_SUBST(ZEND_EXT_TYPE) -dnl Discard optimization flags when debugging is enabled +dnl Discard optimization flags when debugging is enabled. if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1 ZEND_DEBUG=yes @@ -125,7 +123,7 @@ if test "$PHP_DEBUG" = "yes"; then CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` changequote([,]) - dnl add -O0 only if GCC or ICC is used + dnl Add -O0 only if GCC or ICC is used. if test "$GCC" = "yes" || test "$ICC" = "yes"; then CFLAGS="$CFLAGS -O0" CXXFLAGS="$CXXFLAGS -g -O0" @@ -144,10 +142,10 @@ else ZEND_DEBUG=no fi -dnl Always shared +dnl Always shared. PHP_BUILD_SHARED -dnl Required programs +dnl Required programs. PHP_PROG_AWK sinclude(config.m4) @@ -155,8 +153,9 @@ sinclude(config.m4) enable_static=no enable_shared=yes -dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). -dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by +dnl PHP_REQUIRE_CXX). Otherwise AC_PROG_LIBTOOL fails if there is no working C++ +dnl compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) |