Skip to content

Commit 9982ff5

Browse files
author
Sascha Schumann
committed
Nuke some unneccessary quotes
1 parent fab8bd4 commit 9982ff5

File tree

3 files changed

+104
-110
lines changed

3 files changed

+104
-110
lines changed

‎acinclude.m4

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl This file contains local autoconf functions.
55
sinclude(dynlib.m4)
66

77
AC_DEFUN(PHP_REMOVE_USR_LIB,[
8-
ac_new_flags=""
8+
unset ac_new_flags
99
for i in [$]$1; do
1010
case [$]i in
1111
-L/usr/lib|-L/usr/lib/) ;;
@@ -32,7 +32,7 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
3232
fi
3333
3434
old_CPPFLAGS=$CPPFLAGS
35-
CPPFLAGS="-I$OPENSSL_INC"
35+
CPPFLAGS=-I$OPENSSL_INC
3636
AC_MSG_CHECKING(for OpenSSL version)
3737
AC_EGREP_CPP(yes,[
3838
#include <openssl/opensslv.h>
@@ -162,7 +162,7 @@ AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
162162
])
163163

164164
AC_DEFUN(PHP_DEBUG_MACRO,[
165-
DEBUG_LOG="$1"
165+
DEBUG_LOG=$1
166166
cat >$1 <<X
167167
CONFIGURE: $CONFIGURE_COMMAND
168168
CC: $CC
@@ -225,7 +225,7 @@ dnl Stores the location of libgcc in libgcc_libpath
225225
dnl
226226
AC_DEFUN(PHP_LIBGCC_LIBPATH,[
227227
changequote({,})
228-
libgcc_libpath="`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`"
228+
libgcc_libpath=`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`
229229
changequote([,])
230230
])
231231

@@ -242,11 +242,11 @@ shared)
242242
$1=yes
243243
;;
244244
no)
245-
ext_output="no"
245+
ext_output=no
246246
ext_shared=no
247247
;;
248248
*)
249-
ext_output="yes"
249+
ext_output=yes
250250
ext_shared=no
251251
;;
252252
esac
@@ -410,26 +410,26 @@ AC_DEFUN(PHP_RUNPATH_SWITCH,[
410410
dnl check for -R, etc. switch
411411
AC_MSG_CHECKING(if compiler supports -R)
412412
AC_CACHE_VAL(php_cv_cc_dashr,[
413-
SAVE_LIBS="${LIBS}"
414-
LIBS="-R /usr/lib ${LIBS}"
413+
SAVE_LIBS=$LIBS
414+
LIBS="-R /usr/lib $LIBS"
415415
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
416-
LIBS="${SAVE_LIBS}"])
416+
LIBS=$SAVE_LIBS])
417417
AC_MSG_RESULT($php_cv_cc_dashr)
418418
if test $php_cv_cc_dashr = "yes"; then
419-
ld_runpath_switch="-R"
419+
ld_runpath_switch=-R
420420
else
421421
AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
422422
AC_CACHE_VAL(php_cv_cc_rpath,[
423-
SAVE_LIBS="${LIBS}"
424-
LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
423+
SAVE_LIBS=$LIBS
424+
LIBS="-Wl,-rpath,/usr/lib $LIBS"
425425
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
426-
LIBS="${SAVE_LIBS}"])
426+
LIBS=$SAVE_LIBS])
427427
AC_MSG_RESULT($php_cv_cc_rpath)
428428
if test $php_cv_cc_rpath = "yes"; then
429-
ld_runpath_switch="-Wl,-rpath,"
429+
ld_runpath_switch=-Wl,-rpath,
430430
else
431431
dnl something innocuous
432-
ld_runpath_switch="-L"
432+
ld_runpath_switch=-L
433433
fi
434434
fi
435435
])
@@ -476,7 +476,7 @@ dnl set the path of the file which contains the symbol export list
476476
dnl
477477
AC_DEFUN(PHP_SET_SYM_FILE,
478478
[
479-
PHP_SYM_FILE="$1"
479+
PHP_SYM_FILE=$1
480480
])
481481

482482
dnl
@@ -541,7 +541,7 @@ dnl expands path to an absolute path and assigns it to variable
541541
dnl
542542
AC_DEFUN(PHP_EXPAND_PATH,[
543543
if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
544-
$2="$1"
544+
$2=$1
545545
else
546546
changequote({,})
547547
ep_dir="`echo $1|sed 's%/*[^/][^/]*/*$%%'`"
@@ -579,11 +579,11 @@ dnl
579579
AC_DEFUN(PHP_BUILD_RPATH,[
580580
if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then
581581
OLD_RPATHS="$PHP_RPATHS"
582-
PHP_RPATHS=""
582+
unset PHP_RPATHS
583583
for i in $OLD_RPATHS; do
584584
PHP_LDFLAGS="$PHP_LDFLAGS -L$i"
585585
PHP_RPATHS="$PHP_RPATHS -R $i"
586-
NATIVE_RPATHS="$NATIVE_RPATHS ${ld_runpath_switch}$i"
586+
NATIVE_RPATHS="$NATIVE_RPATHS $ld_runpath_switch$i"
587587
done
588588
fi
589589
])
@@ -684,7 +684,7 @@ dnl Check for cc option
684684
dnl
685685
AC_DEFUN(PHP_CHECK_CC_OPTION,[
686686
echo "main(){return 0;}" > conftest.$ac_ext
687-
opt="$1"
687+
opt=$1
688688
changequote({,})
689689
var=`echo $opt|sed 's/[^a-zA-Z0-9]/_/g'`
690690
changequote([,])
@@ -772,12 +772,12 @@ AC_DEFUN(PHP_EXTENSION,[
772772
773773
if test -d "$abs_srcdir/ext/$1"; then
774774
dnl ---------------------------------------------- Internal Module
775-
ext_builddir="ext/$1"
776-
ext_srcdir="$abs_srcdir/ext/$1"
775+
ext_builddir=ext/$1
776+
ext_srcdir=$abs_srcdir/ext/$1
777777
else
778778
dnl ---------------------------------------------- External Module
779-
ext_builddir="."
780-
ext_srcdir="$abs_srcdir"
779+
ext_builddir=.
780+
ext_srcdir=$abs_srcdir
781781
fi
782782
783783
if test "$2" != "shared" && test "$2" != "yes"; then
@@ -809,7 +809,7 @@ dnl choose dynamic extensions, and after the gcc test.
809809
dnl
810810
AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
811811
AC_MSG_CHECKING(whether -fPIC is required)
812-
if test "$EXT_SHARED" != ""; then
812+
if test -n "$EXT_SHARED"; then
813813
os=`uname -sr 2>/dev/null`
814814
case "$os" in
815815
"SunOS 5.6"|"SunOS 5.7")
@@ -939,11 +939,11 @@ int main(void) {
939939
return (unsigned char)'A' != (unsigned char)0xC1;
940940
}
941941
],[
942-
ac_cv_ebcdic="yes"
942+
ac_cv_ebcdic=yes
943943
],[
944-
ac_cv_ebcdic="no"
944+
ac_cv_ebcdic=no
945945
],[
946-
ac_cv_ebcdic="no"
946+
ac_cv_ebcdic=no
947947
])])
948948
if test "$ac_cv_ebcdic" = "yes"; then
949949
AC_DEFINE(CHARSET_EBCDIC,1, [Define if system uses EBCDIC])

‎configure.in

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ for arg in $0 "$@"; do
2323
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
2424
done
2525

26-
php_shtool="$srcdir/build/shtool"
26+
php_shtool=$srcdir/build/shtool
2727
T_MD=`$php_shtool echo -n -e %B`
2828
T_ME=`$php_shtool echo -n -e %b`
2929

@@ -172,26 +172,26 @@ PHP_MISSING_TIME_R_DECL
172172
dnl check for -R, etc. switch
173173
AC_MSG_CHECKING(whether compiler supports -R)
174174
AC_CACHE_VAL(php_cv_cc_dashr,[
175-
SAVE_LIBS="${LIBS}"
176-
LIBS="-R /usr/lib ${LIBS}"
175+
SAVE_LIBS=$LIBS
176+
LIBS="-R /usr/lib $LIBS"
177177
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
178-
LIBS="${SAVE_LIBS}"])
178+
LIBS=$SAVE_LIBS])
179179
AC_MSG_RESULT($php_cv_cc_dashr)
180180
if test $php_cv_cc_dashr = "yes"; then
181-
ld_runpath_switch="-R"
181+
ld_runpath_switch=-R
182182
else
183183
AC_MSG_CHECKING([whether compiler supports -Wl,-rpath,])
184184
AC_CACHE_VAL(php_cv_cc_rpath,[
185-
SAVE_LIBS="${LIBS}"
186-
LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
185+
SAVE_LIBS=$LIBS
186+
LIBS="-Wl,-rpath,/usr/lib $LIBS"
187187
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
188-
LIBS="${SAVE_LIBS}"])
188+
LIBS=$SAVE_LIBS])
189189
AC_MSG_RESULT($php_cv_cc_rpath)
190190
if test $php_cv_cc_rpath = "yes"; then
191-
ld_runpath_switch="-Wl,-rpath,"
191+
ld_runpath_switch=-Wl,-rpath,
192192
else
193193
dnl something innocuous
194-
ld_runpath_switch="-L"
194+
ld_runpath_switch=-L
195195
fi
196196
fi
197197

@@ -476,34 +476,34 @@ PHP_ARG_WITH(config-file-path,[path to configuration file],
476476
Sets the path in which to look for php.ini,
477477
defaults to PREFIX/lib], DEFAULT)
478478
479-
if test "x$PHP_CONFIG_FILE_PATH" = "xDEFAULT"; then
479+
if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
480480
case $PHP_LAYOUT in
481481
GNU)
482-
PHP_CONFIG_FILE_PATH="$sysconfdir"
482+
PHP_CONFIG_FILE_PATH=$sysconfdir
483483
oldstyleextdir=no;;
484484
*)
485-
PHP_CONFIG_FILE_PATH="$libdir"
485+
PHP_CONFIG_FILE_PATH=$libdir
486486
oldstyleextdir=yes;;
487487
esac
488488
fi
489489
490490
# compatibility
491491
if test "x$with_pear" = "x" -a "x$enable_pear" = "xno"; then
492-
with_pear="no"
492+
with_pear=no
493493
fi
494494
495495
PHP_ARG_WITH(pear, [whether to install PEAR, and where],
496496
[ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php)
497497
--without-pear Do not install PEAR], DEFAULT)
498498
499-
if test "x$PHP_PEAR" != "xno"; then
499+
if test "$PHP_PEAR" != "no"; then
500500
PEAR_DIR=pear
501501
fi
502502
503-
if test "x$PHP_PEAR" = "xDEFAULT"; then
503+
if test "$PHP_PEAR" = "DEFAULT"; then
504504
case $PHP_LAYOUT in
505-
GNU) PEAR_INSTALLDIR="$datadir/pear";;
506-
*) PEAR_INSTALLDIR="$libdir/php";;
505+
GNU) PEAR_INSTALLDIR=$datadir/pear;;
506+
*) PEAR_INSTALLDIR=$libdir/php;;
507507
esac
508508
fi
509509
@@ -698,8 +698,7 @@ if test "$abs_srcdir" != "$abs_builddir"; then
698698
fi
699699
700700
EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
701-
LIBS=""
702-
LDFLAGS=""
701+
unset LIBS LDFLAGS
703702
704703
PHP_CONFIGURE_PART(Configuring TSRM)
705704
TSRM_BASIC_CHECKS
@@ -708,31 +707,30 @@ if test "$PHP_THREAD_SAFETY" = "yes"; then
708707
fi
709708
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
710709
EXTRA_LIBS="$EXTRA_LIBS $LIBS"
711-
LDFLAGS=""
712-
LIBS=""
710+
unset LIBS LDFLAGS
713711
714-
test "$prefix" = "NONE" && prefix="/usr/local"
712+
test "$prefix" = "NONE" && prefix=/usr/local
715713
test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
716714
717715
case $libdir in
718716
'${exec_prefix}/lib')
719-
libdir="$libdir/php"
717+
libdir=$libdir/php
720718
;;
721719
esac
722720
case $datadir in
723721
'${prefix}/share')
724-
datadir="$datadir/php"
722+
datadir=$datadir/php
725723
;;
726724
*) ;;
727725
esac
728726
729-
phplibdir="`pwd`/modules"
727+
phplibdir=`pwd`/modules
730728
$php_shtool mkdir -p $phplibdir
731-
phptempdir="`pwd`/libs"
729+
phptempdir=`pwd`/libs
732730
733-
old_exec_prefix="$exec_prefix"
734-
old_libdir="$libdir"
735-
old_datadir="$datadir"
731+
old_exec_prefix=$exec_prefix
732+
old_libdir=$libdir
733+
old_datadir=$datadir
736734
exec_prefix=`eval echo $exec_prefix`
737735
libdir=`eval echo $libdir`
738736
datadir=`eval echo $datadir`
@@ -741,30 +739,30 @@ dnl Build extension directory path
741739
742740
ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
743741
744-
if test "x$EXTENSION_DIR" = "x"; then
745-
extbasedir="$ZEND_MODULE_API_NO"
742+
if test -z "$EXTENSION_DIR"; then
743+
extbasedir=$ZEND_MODULE_API_NO
746744
if test "$oldstyleextdir" = "yes"; then
747745
if test "$PHP_DEBUG" = "1"; then
748-
part1="debug"
746+
part1=debug
749747
else
750-
part1="no-debug"
748+
part1=no-debug
751749
fi
752750
if test "$enable_experimental_zts" = "yes"; then
753-
part2="zts"
751+
part2=zts
754752
else
755-
part2="non-zts"
753+
part2=non-zts
756754
fi
757-
extbasedir="$part1-$part2-$extbasedir"
758-
EXTENSION_DIR="$libdir/extensions/$extbasedir"
755+
extbasedir=$part1-$part2-$extbasedir
756+
EXTENSION_DIR=$libdir/extensions/$extbasedir
759757
else
760758
if test "$enable_experimental_zts" = "yes"; then
761-
extbasedir="${extbasedir}-zts"
759+
extbasedir=$extbasedir-zts
762760
fi
763761
764762
if test "$PHP_DEBUG" = "1"; then
765-
extbasedir="${extbasedir}-debug"
763+
extbasedir=$extbasedir-debug
766764
fi
767-
EXTENSION_DIR="$libdir/$extbasedir"
765+
EXTENSION_DIR=$libdir/$extbasedir
768766
fi
769767
fi
770768
@@ -773,15 +771,15 @@ EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR`
773771
EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
774772
EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
775773
EXPANDED_BINDIR=`eval echo $bindir`
776-
EXPANDED_LIBDIR="$libdir"
774+
EXPANDED_LIBDIR=$libdir
777775
EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
778-
EXPANDED_DATADIR="$datadir"
776+
EXPANDED_DATADIR=$datadir
779777
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
780-
INCLUDE_PATH=".:${EXPANDED_PEAR_INSTALLDIR}"
778+
INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
781779
782-
exec_prefix="$old_exec_prefix"
783-
libdir="$old_libdir"
784-
datadir="$old_datadir"
780+
exec_prefix=$old_exec_prefix
781+
libdir=$old_libdir
782+
datadir=$old_datadir
785783
786784
AC_SUBST(INCLUDE_PATH)
787785
AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
@@ -864,7 +862,7 @@ PHP_SUBST_OLD(YACC)
864862
865863
PHP_CONFIGURE_PART(Configuring libtool)
866864
867-
old_CC="$CC"
865+
old_CC=$CC
868866
869867
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
870868
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
@@ -904,7 +902,7 @@ else
904902
fi
905903
fi
906904
907-
CC="$old_CC"
905+
CC=$old_CC
908906
909907
changequote({,})
910908
if test "$PHP_PIC" = "no"; then

0 commit comments

Comments
 (0)