cvs: php4 / configure.in

sas Mon Mar 11 07:56:19 2002 EDT Modified files: /php4 configure.in Log: Use standard PHP shell check syntax Index: php4/configure.in diff -u php4/configure.in:1.308 php4/configure.in:1.309 --- php4/configure.in:1.308 Mon Mar 11 07:50:18 2002 +++ php4/configure.in Mon Mar 11 07:56:19 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.308 2002/03/11 12:50:18 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.309 2002/03/11 12:56:19 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -605,8 +605,8 @@ fi # compatibility -if test "x$with_pear" = "x" -a "x$enable_pear" = "xno"; then - with_pear=no +if test -z "$with_pear" && test "$enable_pear" = "no"; then + with_pear=no fi PHP_ARG_WITH(pear, [whether to install PEAR, and where], @@ -618,7 +618,7 @@ PEAR_INSTALLDIR=$PHP_PEAR fi -if test "$PHP_PEAR" = "DEFAULT" -o "x$PHP_PEAR" = "xyes"; then +if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then case $PHP_LAYOUT in GNU) PEAR_INSTALLDIR=$datadir/pear;; *) PEAR_INSTALLDIR=$libdir/php;;