]>
Commit | Line | Data |
---|---|---|
5351b1e5 AF |
1 | --- php-4.0.6/configure.in.pear Mon Jul 9 12:11:47 2001 |
2 | +++ php-4.0.6/configure.in Mon Jul 9 12:19:09 2001 | |
3 | @@ -501,13 +501,14 @@ | |
4 | ||
5 | if test "x$PHP_PEAR" != "xno"; then | |
6 | PEAR_DIR=pear | |
7 | -fi | |
8 | - | |
9 | -if test "x$PHP_PEAR" = "xDEFAULT"; then | |
10 | - case $PHP_LAYOUT in | |
11 | - GNU) PEAR_INSTALLDIR="$datadir/pear";; | |
12 | - *) PEAR_INSTALLDIR="$libdir/php";; | |
13 | - esac | |
14 | + if test "x$PHP_PEAR" = "xDEFAULT" -o "x$PHP_PEAR" = "xyes" ; then | |
15 | + case $PHP_LAYOUT in | |
16 | + GNU) PEAR_INSTALLDIR="$datadir/pear";; | |
17 | + *) PEAR_INSTALLDIR="$libdir/php";; | |
18 | + esac | |
19 | + else | |
20 | + PEAR_INSTALLDIR="$PHP_PEAR" | |
21 | + fi | |
22 | fi | |
23 | ||
24 | test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" |