From: Stig Bakken Date: Mon, 27 May 2002 22:28:26 +0000 (+0000) Subject: * moved the --without-pear compat defines to the right place X-Git-Tag: NEW_UI_API_BP~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=926dcdc854ac23a7c49366ea44e04b600ff00709;p=php * moved the --without-pear compat defines to the right place --- diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php index 09c1cef3ed..6bdbd618a7 100644 --- a/pear/PEAR/Config.php +++ b/pear/PEAR/Config.php @@ -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.