@@ -65,8 +65,9 @@ PHP_MAJOR_VERSION=[$]1
65
65
PHP_MINOR_VERSION=[ $] 2
66
66
PHP_RELEASE_VERSION=[ $] 3
67
67
dnl Allow overriding PHP_EXTRA_VERSION through the homonymous env var
68
- AC_ARG_VAR ( [ PHP_EXTRA_VERSION] ,[ Extra PHP version label suffix, e.g. '-dev', 'rc1', '-acme'] ) dnl
69
- AS_IF ( [ test -z "$PHP_EXTRA_VERSION"] ,[ PHP_EXTRA_VERSION=[ $] 4] )
68
+ AC_ARG_VAR ( [ PHP_EXTRA_VERSION] ,
69
+ [ Extra PHP version label suffix, e.g. '-dev', 'rc1', '-acme'] ) dnl
70
+ AS_VAR_IF ( [ PHP_EXTRA_VERSION] ,, [ PHP_EXTRA_VERSION=[ $] 4] )
70
71
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
71
72
PHP_VERSION_ID=$(expr [ $] PHP_MAJOR_VERSION \* 10000 + [ $] PHP_MINOR_VERSION \* 100 + [ $] PHP_RELEASE_VERSION)
72
73
@@ -764,7 +765,7 @@ PHP_ARG_ENABLE([gcov],
764
765
[ no] ,
765
766
[ no] )
766
767
767
- if test "$ PHP_GCOV" = " yes"; then
768
+ AS_VAR_IF ( [ PHP_GCOV] , [ yes] , [
768
769
AS_VAR_IF ( [ GCC] , [ yes] ,,
769
770
[ AC_MSG_ERROR ( [ GNU C compatible compiler is required for --enable-gcov] ) ] )
770
771
@@ -793,7 +794,7 @@ if test "$PHP_GCOV" = "yes"; then
793
794
dnl Add the special gcc flags.
794
795
CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
795
796
CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage"
796
- fi
797
+ ] )
797
798
798
799
PHP_ARG_ENABLE([ debug] ,
799
800
[ whether to include debugging symbols] ,
@@ -1282,9 +1283,7 @@ if test "$fiber_asm" = 'yes'; then
1282
1283
[ $fiber_asm_cflag] )
1283
1284
AC_MSG_RESULT ( [ $fiber_asm_file] )
1284
1285
else
1285
- if test "$fiber_os" = 'mac'; then
1286
- AC_DEFINE ( [ _XOPEN_SOURCE] , 1 , [ ] )
1287
- fi
1286
+ AS_VAR_IF ( [ fiber_os] , [ mac] , [ AC_DEFINE ( [ _XOPEN_SOURCE] , [ 1] , [ ] ) ] )
1288
1287
AC_CHECK_HEADER ( [ ucontext.h] ,
1289
1288
[ AC_DEFINE ( [ ZEND_FIBER_UCONTEXT] , [ 1] ,
1290
1289
[ Define to 1 if Zend fiber uses ucontext instead of boost context.] ) ] ,
@@ -1317,11 +1316,8 @@ AS_VAR_IF([program_prefix], [NONE], [program_prefix=])
1317
1316
AS_VAR_IF ( [ program_suffix] , [ NONE] , [ program_suffix=] )
1318
1317
1319
1318
orig_libdir=$libdir
1320
- case $libdir in
1321
- '${exec_prefix}/lib')
1322
- libdir=$libdir/php
1323
- ;;
1324
- esac
1319
+ AS_CASE ( [ $libdir] ,
1320
+ [ '${exec_prefix}/lib'] , [ libdir=$libdir/php] )
1325
1321
1326
1322
AS_CASE ( [ $(eval echo $datadir)] ,
1327
1323
[ '${prefix}/share'] , [ datadir=$datadir/php] )
0 commit comments