@@ -486,24 +486,24 @@ if test "$PHP_FPM" != "no"; then
486
486
] )
487
487
488
488
if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test "$PHP_FPM_USER" = "no"; then
489
- php_fpm_user=" nobody"
489
+ php_fpm_user=nobody
490
490
else
491
- php_fpm_user=" $PHP_FPM_USER"
491
+ php_fpm_user=$PHP_FPM_USER
492
492
fi
493
493
494
494
if test -z "$PHP_FPM_GROUP" || test "$PHP_FPM_GROUP" = "yes" || test "$PHP_FPM_GROUP" = "no"; then
495
- php_fpm_group=" nobody"
495
+ php_fpm_group=nobody
496
496
else
497
- php_fpm_group=" $PHP_FPM_GROUP"
497
+ php_fpm_group=$PHP_FPM_GROUP
498
498
fi
499
499
500
500
AC_SUBST ( [ php_fpm_user] )
501
501
AC_SUBST ( [ php_fpm_group] )
502
- php_fpm_sysconfdir=` eval echo $sysconfdir`
502
+ php_fpm_sysconfdir=$( eval echo $sysconfdir)
503
503
AC_SUBST ( [ php_fpm_sysconfdir] )
504
- php_fpm_localstatedir=` eval echo $localstatedir`
504
+ php_fpm_localstatedir=$( eval echo $localstatedir)
505
505
AC_SUBST ( [ php_fpm_localstatedir] )
506
- php_fpm_prefix=` eval echo $prefix`
506
+ php_fpm_prefix=$( eval echo $prefix)
507
507
AC_SUBST ( [ php_fpm_prefix] )
508
508
509
509
PHP_ADD_BUILD_DIR([ sapi/fpm/fpm] )
@@ -560,17 +560,15 @@ if test "$PHP_FPM" != "no"; then
560
560
[ $PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES] ,
561
561
[ $PHP_FPM_CFLAGS] )
562
562
563
- case $host_alias in
564
- *aix*)
565
- BUILD_FPM="echo '\# ! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
566
- ;;
567
- *darwin*)
568
- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
569
- ;;
570
- *)
571
- BUILD_FPM="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
572
- ;;
573
- esac
563
+ AS_CASE ( [ $host_alias] ,
564
+ [ *aix*] , [
565
+ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([ A-Za-z0-9_] *\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr ( \$\$3 ,1 ,1 ) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
566
+ ] ,
567
+ [ *darwin*] , [
568
+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
569
+ ] , [
570
+ BUILD_FPM="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
571
+ ] )
574
572
575
573
PHP_SUBST([ SAPI_FPM_PATH] )
576
574
PHP_SUBST([ BUILD_FPM] )
0 commit comments