Nuke more quotes

Author: Sascha Schumann

acinclude.m4

@@ -70,7 +70,7 @@ dnl notation.
 dnl
 AC_DEFUN(PHP_EVAL_LIBLINE,[
   for ac_i in $1; do
-    case "$ac_i" in
+    case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
       PHP_ADD_LIBRARY($ac_ii,,$2)
@@ -90,7 +90,7 @@ dnl build system which are only given in compiler notation.
 dnl
 AC_DEFUN(PHP_EVAL_INCLINE,[
   for ac_i in $1; do
-    case "$ac_i" in
+    case $ac_i in
     -I*)
       ac_ii=`echo $ac_i|cut -c 3-`
       PHP_ADD_INCLUDE($ac_ii)
@@ -142,7 +142,7 @@ int readdir_r(DIR *, struct dirent *);
       ac_cv_what_readdir_r=none
    ])
   ])
-    case "$ac_cv_what_readdir_r" in
+    case $ac_cv_what_readdir_r in
     POSIX)
       AC_DEFINE(HAVE_POSIX_READDIR_R,1,[whether you have POSIX readdir_r]);;
     old-style)
@@ -154,7 +154,7 @@ int readdir_r(DIR *, struct dirent *);
 AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
   PHP_SUBST(SHLIB_SUFFIX_NAME)
   SHLIB_SUFFIX_NAME=so
-  case "$host_alias" in
+  case $host_alias in
   *hpux*)
 	SHLIB_SUFFIX_NAME=sl
 	;;
@@ -230,7 +230,7 @@ AC_DEFUN(PHP_LIBGCC_LIBPATH,[
 ])
 
 AC_DEFUN(PHP_ARG_ANALYZE,[
-case "[$]$1" in
+case [$]$1 in
 shared,*)
   ext_output="yes, shared"
   ext_shared=yes
@@ -612,7 +612,7 @@ dnl
 dnl add a library to the link line
 dnl
 AC_DEFUN(PHP_ADD_LIBRARY,[
- case "$1" in
+ case $1 in
  c|c_r|pthread*) ;;
  *)
 ifelse($3,,[
@@ -811,9 +811,9 @@ AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
   AC_MSG_CHECKING(whether -fPIC is required)
   if test -n "$EXT_SHARED"; then
     os=`uname -sr 2>/dev/null`
-    case "$os" in
+    case $os in
         "SunOS 5.6"|"SunOS 5.7")
-          case "$CC" in
+          case $CC in
 	    gcc*|egcs*) CFLAGS="$CFLAGS -fPIC";;
 	    *) CFLAGS="$CFLAGS -fpic";;
 	  esac

configure.in

@@ -93,7 +93,7 @@ AC_AIX
 
 BSD_MAKEFILE=no
 
-case "$host_alias" in
+case $host_alias in
 *solaris*)
     CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
     if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
@@ -653,7 +653,7 @@ divert(6)
 enable_shared=yes
 enable_static=yes
 
-case "$php_build_target" in
+case $php_build_target in
 program)
     enable_shared=no
 ;;

ext/ccvs/config.m4

@@ -8,8 +8,8 @@ AC_ARG_WITH(ccvs,
 [
   if test "$withval" != "no"; then
      CCVS_DIR="$withval"
-	test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR="$withval/include"
-    test -f $withval/lib/libccvs.a && CCVS_LIB_DIR="$withval/lib"
+	test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR=$withval/include
+    test -f $withval/lib/libccvs.a && CCVS_LIB_DIR=$withval/lib
 
      	if test -n "$CCVS_DIR"; then
 		AC_MSG_RESULT(yes)

ext/cpdf/config.m4

@@ -6,7 +6,7 @@ AC_ARG_WITH(cpdflib,
                           DIR is the cpdfllib install directory,
                           defaults to /usr.],
 [
-  case "$withval" in
+  case $withval in
     no)
       AC_MSG_RESULT(no) ;;
     yes)
@@ -19,7 +19,7 @@ AC_ARG_WITH(cpdflib,
       PHP_ADD_LIBRARY(jpeg)
       ;;
     *)
-      test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE="$withval/include"
+      test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
       if test -n "$CPDFLIB_INCLUDE" ; then
         AC_MSG_RESULT(yes)
         PHP_EXTENSION(cpdf)
@@ -31,7 +31,7 @@ AC_ARG_WITH(cpdflib,
         [  --with-jpeg-dir[=DIR]   jpeg dir for cpdflib 2.x],[
           AC_MSG_RESULT(yes)
           if test -z $withval; then
-            withval="/usr/local"
+            withval=/usr/local
           fi
           LIBS="$LIBS -L$withval/lib"
           AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
@@ -46,7 +46,7 @@ AC_ARG_WITH(cpdflib,
         [  --with-tiff-dir[=DIR]   tiff dir for cpdflib 2.x],[
           AC_MSG_RESULT(yes)
           if test -z $withval; then
-            withval="/usr/local"
+            withval=/usr/local
           fi
           LIBS="$LIBS -L$withval/lib"
           AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)

ext/cybercash/config.m4

@@ -7,16 +7,16 @@ AC_ARG_WITH(cybercash,
                           install directory.],
 [
   if test "$withval" != "no"; then
-      test -f $withval/mckcrypt.h && MCK_DIR="$withval"
-      test -f $withval/c-api/mckcrypt.h && MCK_DIR="$withval/c-api"
+      test -f $withval/mckcrypt.h && MCK_DIR=$withval
+      test -f $withval/c-api/mckcrypt.h && MCK_DIR=$withval/c-api
       if test -n "$MCK_DIR"; then
 	AC_MSG_RESULT(yes)
 	PHP_EXTENSION(cybercash)
-	old_LIBS="$LIBS"
+	old_LIBS=$LIBS
 	LIBS="$LIBS -L$MCK_DIR/lib"
 	AC_CHECK_LIB(mckcrypto,base64_encode,[AC_DEFINE(HAVE_MCK,1,[ ])],
 		[AC_MSG_ERROR(Please reinstall the CyberCash MCK - cannot find mckcrypto lib)])
-	LIBS="$old_LIBS"
+	LIBS=$old_LIBS
 	PHP_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib)
 	PHP_ADD_INCLUDE($MCK_DIR)
       else

ext/db/config.m4

@@ -33,9 +33,9 @@ if test "$PHP_DB" != "no"; then
   if test "$DBM_LIB" = "-lgdbm"; then
     AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ 
       AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); 
-      AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[
+      AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[
         AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
-        AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[
+        AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE=-I/opt/local/include ],[
           dnl if in /usr/pkg/include, do not add anything.  See above.
           AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
           AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[

ext/domxml/config.m4

@@ -3,7 +3,7 @@ dnl config.m4 for extension domxml
 
 AC_DEFUN(PHP_DOM_CHECK_VERSION,[
   old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="-I$DOMXML_DIR/include"
+  CPPFLAGS=-I$DOMXML_DIR/include
   AC_MSG_CHECKING(for libxml version)
   AC_EGREP_CPP(yes,[
   #include <libxml/xmlversion.h>
@@ -47,9 +47,9 @@ if test "$PHP_DOM" != "no"; then
   PHP_ADD_INCLUDE($DOMXML_DIR/include)
 
   if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
-    DOM_LIBNAME="xml2"
+    DOM_LIBNAME=xml2
   else
-    DOM_LIBNAME="xml"
+    DOM_LIBNAME=xml
   fi
 
   PHP_SUBST(DOMXML_SHARED_LIBADD)

ext/fbsql/config.m4

@@ -14,7 +14,7 @@ if test "$PHP_FBSQL" != "no"; then
 
     for i in /Local/Library /usr /usr/local /opt /Library; do
       if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h; then
-        FBSQL_INSTALLATION_DIR="$i/FrontBase"
+        FBSQL_INSTALLATION_DIR=$i/FrontBase
         break
       fi
     done

ext/fribidi/config.m4

@@ -17,7 +17,7 @@ dnl if module was requested with default path of fribidi installation then
 dnl $PHP_FRIBIDI will be "yes"
 
   if test "$PHP_FRIBIDI" = "yes"; then
-    PHP_FRIBIDI="/usr/local"
+    PHP_FRIBIDI=/usr/local
   fi
 
 
@@ -26,7 +26,7 @@ dnl $PHP_FRIBIDI will be "yes"
 
   AC_MSG_CHECKING([for header files in "$PHP_FRIBIDI/include/fribidi"])
   if test -f $PHP_FRIBIDI/include/fribidi/fribidi.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_types.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_char_sets.h; then
-    FRIBIDI_INCDIR="$PHP_FRIBIDI/include/fribidi/"
+    FRIBIDI_INCDIR=$PHP_FRIBIDI/include/fribidi/
     AC_MSG_RESULT([found all])
   else
     AC_MSG_RESULT([missing])
@@ -38,7 +38,7 @@ dnl $PHP_FRIBIDI will be "yes"
 
   AC_MSG_CHECKING([for libfribidi.so file in "$PHP_FRIBIDI/lib/"])
   if test -f "$PHP_FRIBIDI/lib/libfribidi.so" ; then
-    FRIBIDI_LIBDIR="$PHP_FRIBIDI/lib/"
+    FRIBIDI_LIBDIR=$PHP_FRIBIDI/lib/
     AC_MSG_RESULT([found])
   else
     AC_MSG_RESULT([missing])

ext/gd/config.m4

@@ -76,12 +76,12 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
       if test -n "$PHP_TTF" ; then
         for i in /usr /usr/local "$PHP_TTF" ; do
           if test -f "$i/include/freetype.h" ; then
-            TTF_DIR="$i"
+            TTF_DIR=$i
             unset TTF_INC_DIR
           fi
           if test -f "$i/include/freetype/freetype.h"; then
-            TTF_DIR="$i"
-            TTF_INC_DIR="$i/include/freetype"
+            TTF_DIR=$i
+            TTF_INC_DIR=$i/include/freetype
           fi
         done
       fi
@@ -90,7 +90,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
         PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
       fi
       if test -z "$TTF_INC_DIR"; then
-        TTF_INC_DIR="$TTF_DIR/include"
+        TTF_INC_DIR=$TTF_DIR/include
       fi
       PHP_ADD_INCLUDE($TTF_INC_DIR)
     else
@@ -106,8 +106,8 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
   if test "$PHP_FREETYPE_DIR" != "no"; then
     for i in /usr /usr/local "$PHP_FREETYPE_DIR" ; do
       if test -f "$i/include/freetype2/freetype/freetype.h"; then
-        FREETYPE2_DIR="$i"
-        FREETYPE2_INC_DIR="$i/include/freetype2/freetype"
+        FREETYPE2_DIR=$i
+        FREETYPE2_INC_DIR=$i/include/freetype2/freetype
       fi
     done
     
@@ -131,7 +131,7 @@ AC_DEFUN(PHP_GD_T1LIB,[
   if test "$PHP_T1LIB" != "no"; then
     for i in /usr/local /usr $PHP_T1LIB; do
       if test -f "$i/include/t1lib.h"; then
-        T1_DIR="$i"
+        T1_DIR=$i
       fi
     done
 
@@ -192,7 +192,7 @@ dnl Various checks for GD features
   PHP_GD_FREETYPE1
   PHP_GD_T1LIB
 
-  case "$PHP_GD" in
+  case $PHP_GD in
     yes)
       PHP_ADD_LIBRARY(gd,, GD_SHARED_LIBADD)
       PHP_GD_CHECK_VERSION
@@ -201,11 +201,11 @@ dnl Various checks for GD features
     *)
 dnl A whole whack of possible places where these might be
       for i in include/gd1.3 include/gd include gd1.3 gd ""; do
-        test -f $PHP_GD/$i/gd.h && GD_INCLUDE="$PHP_GD/$i"
+        test -f $PHP_GD/$i/gd.h && GD_INCLUDE=$PHP_GD/$i
       done
 
       for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
-        test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB="$PHP_GD/$i"
+        test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i
       done
 
       if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
@@ -220,12 +220,12 @@ dnl A whole whack of possible places where these might be
 
 dnl NetBSD package structure
   if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
-    GD_INCLUDE="/usr/pkg/include/gd"
+    GD_INCLUDE=/usr/pkg/include/gd
   fi
 
 dnl SuSE 6.x package structure
   if test -f /usr/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
-    GD_INCLUDE="/usr/include/gd"
+    GD_INCLUDE=/usr/include/gd
   fi
 
   PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE)

ext/gettext/config.m4

@@ -20,14 +20,14 @@ if test "$PHP_GETTEXT" != "no"; then
   GETTEXT_LIBDIR=$GETTEXT_DIR/lib
   GETTEXT_INCDIR=$GETTEXT_DIR/include
 
-  O_LDFLAGS="$LDFLAGS"
+  O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="intl",[
+  AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS=intl,[
       AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS= ,[
           AC_MSG_ERROR(Unable to find required gettext library)
       ])
   ])
-  LDFLAGS="$O_LDFLAGS"
+  LDFLAGS=$O_LDFLAGS
 
   AC_DEFINE(HAVE_LIBINTL,1,[ ])
   PHP_EXTENSION(gettext, $ext_shared)

ext/informix/config.m4

@@ -20,15 +20,15 @@ WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
           PHP_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD)
           PHP_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD)
         else
-          IFX_LIBDIR="$IFX_LIBDIR"
+          IFX_LIBDIR=$IFX_LIBDIR
         fi
       else
         IFX_INCDIR=$PHP_INFORMIX/incl/esql
         if test -z "$IFX_LIBDIR"; then
           PHP_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD)
           PHP_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD)
         else
-          IFX_LIBDIR="$IFX_LIBDIR"
+          IFX_LIBDIR=$IFX_LIBDIR
         fi
         if test "$PHP_INFORMIX" != "$INFORMIXDIR"; then
           INFORMIX_WARNING="
@@ -52,7 +52,7 @@ WARNING: You specified Informix base install directory that is different
       CPPFLAGS="$CPPFLAGS $IFX_INCLUDE"
       LDFLAGS="$LDFLAGS $IFX_LFLAGS"
 
-      case "$host_alias" in
+      case $host_alias in
 	  *aix*)
         CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";;
       esac
@@ -62,16 +62,16 @@ WARNING: You specified Informix base install directory that is different
       IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
       if test $IFX_VERSION -ge "900"; then
         AC_DEFINE(HAVE_IFX_IUS,1,[ ])
-        IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
+        IFX_ESQL_FLAGS=-EDHAVE_IFX_IUS
       else
-        IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
+        IFX_ESQL_FLAGS=-EUHAVE_IFX_IUS
       fi
       PHP_SUBST(IFX_ESQL_FLAGS)
 	  PHP_SUBST(INFORMIX_SHARED_LIBADD)
       AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
       PHP_EXTENSION(informix, $ext_shared)
       for i in $IFX_LIBS; do
-        case "$i" in
+        case $i in
         *.o)
             PHP_ADD_LIBPATH($abs_builddir/ext/informix, INFORMIX_SHARED_LIBADD)
             PHP_ADD_LIBRARY(php_ifx, 1, INFORMIX_SHARED_LIBADD)