--with-pear[=DIR] patch (updated)
| From: | Jon Parise | Date: | Sun, 08 Apr 2001 02:19:28 +0000 |
| Subject: | --with-pear[=DIR] patch (updated) | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-51130@lists.php.net to get a copy of this message | ||
I found a small bug in my last patch that adds --with-pear support to
PHP's configure system. I neglected to set the PEAR_DIR variable in
the default case.
The attached patch resolves that problem.
--
Jon Parise (jon@csh.rit.edu) . Rochester Inst. of Technology
http://www.csh.rit.edu/~jon/ : Computer Science House
Member
Index: configure.in =================================================================== RCS file: /repository/php4/configure.in,v retrieving revision 1.230 diff -u -r1.230 configure.in --- configure.in 2001/04/06 16:01:20 1.230 +++ configure.in 2001/04/08 02:15:33 @@ -592,12 +592,26 @@ CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" fi -PHP_ARG_ENABLE(pear,whether to install PEAR, -[ --disable-pear Do not install PEAR],yes) - -if test "$PHP_PEAR" = "yes"; then - PEAR_DIR=pear -fi +AC_MSG_CHECKING(where to install PEAR) +AC_ARG_WITH(pear, +[ --with-pear[=DIR] Install PEAR hierarchy], +[ + if test "$withval" != "no"; then + PEAR_DIR=pear + if test "$withval" = "yes"; then + PEAR_INSTALLDIR="/usr/local/lib/php" + else + PEAR_INSTALLDIR="$withval" + fi + AC_MSG_RESULT($PEAR_INSTALLDIR) + else + AC_MSG_RESULT("PEAR will not be installed") + fi +],[ + PEAR_DIR=pear + PEAR_INSTALLDIR="/usr/local/lib/php" + AC_MSG_RESULT($PEAR_INSTALLDIR) +]) divert(5)
Index: configure.in =================================================================== RCS file: /repository/php4/configure.in,v retrieving revision 1.230 diff -u -r1.230 configure.in --- configure.in 2001/04/06 16:01:20 1.230 +++ configure.in 2001/04/08 02:15:33 @@ -592,12 +592,26 @@ CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" fi -PHP_ARG_ENABLE(pear,whether to install PEAR, -[ --disable-pear Do not install PEAR],yes) - -if test "$PHP_PEAR" = "yes"; then - PEAR_DIR=pear -fi +AC_MSG_CHECKING(where to install PEAR) +AC_ARG_WITH(pear, +[ --with-pear[=DIR] Install PEAR hierarchy], +[ + if test "$withval" != "no"; then + PEAR_DIR=pear + if test "$withval" = "yes"; then + PEAR_INSTALLDIR="/usr/local/lib/php" + else + PEAR_INSTALLDIR="$withval" + fi + AC_MSG_RESULT($PEAR_INSTALLDIR) + else + AC_MSG_RESULT("PEAR will not be installed") + fi +],[ + PEAR_DIR=pear + PEAR_INSTALLDIR="/usr/local/lib/php" + AC_MSG_RESULT($PEAR_INSTALLDIR) +]) divert(5)