php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* moved the --without-pear compat defines to the right place

Browse Source
This commit is contained in:
Stig Bakken
2002-05-27 22:28:26 +00:00
parent 076202e02c
commit 926dcdc854
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pear/PEAR/Config.php
+8 -8
View File
@@ -26,6 +26,14 @@ require_once 'PEAR.php';
*/
$GLOBALS['_PEAR_Config_instance'] = null;
// in case a --without-pear PHP installation is used
if (!defined('PEAR_INSTALL_DIR')) {
define('PEAR_INSTALL_DIR', PHP_LIBDIR);
}
if (!defined('PEAR_EXTENSION_DIR')) {
define('PEAR_EXTENSION_DIR', PHP_EXTENSION_DIR);
}
define('PEAR_CONFIG_DEFAULT_BINDIR',
PHP_BINDIR);
define('PEAR_CONFIG_DEFAULT_DOCDIR',
@@ -39,14 +47,6 @@ define('PEAR_CONFIG_DEFAULT_TESTDIR',
PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
define('PEAR_DEFAULT_UMASK', umask());
// in case a --without-pear PHP installation is used
if (!defined('PEAR_INSTALL_DIR')) {
define('PEAR_INSTALL_DIR', PHP_LIBDIR);
}
if (!defined('PEAR_EXTENSION_DIR')) {
define('PEAR_EXTENSION_DIR', PHP_EXTENSION_DIR);
}
/**
* This is a class for storing configuration data, keeping track of
* which are system-defined, user-defined or defaulted.