--- php-4.3.2/ext/oci8/config.m4.dist	2003-07-01 09:55:33.000000000 +0200
+++ php-4.3.2/ext/oci8/config.m4	2003-07-01 0:56:01.000000000 +0200
@@ -100,7 +100,6 @@
       PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
       PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
       AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
-      AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
 
       dnl These functions are only available in version >= 9.2
       PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate,
--- php-4.3.2/configure.dist	2003-07-01 13:52:41.000000000 +0200
+++ php-4.3.2/configure	2003-07-01 13:53:15.000000000 +0200
@@ -51349,10 +51349,6 @@
 #define HAVE_OCI8_ATTR_STATEMENT 1
 EOF
 
-      cat >> confdefs.h <<\EOF
-#define HAVE_OCI8_SHARED_MODE 1
-EOF
-
 
             
   save_old_LDFLAGS=$LDFLAGS
--- php-4.3.2/pear/PEAR/Installer.php.dist	2003-07-28 13:57:01.000000000 +0200
+++ php-4.3.2/pear/PEAR/Installer.php	2003-07-28 14:00:12.000000000 +0200
@@ -115,7 +115,6 @@
         parent::PEAR_Common();
         $this->setFrontendObject($ui);
         $this->debug = $this->config->get('verbose');
-        $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
     }
 
     // }}}
@@ -786,6 +785,19 @@
 
     function checkDeps(&$pkginfo)
     {
+        if ($this->registry == null) {
+            $php_dir = $this->config->get('php_dir');
+            if (isset($options['installroot'])) {
+                if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
+                    $options['installroot'] = substr($options['installroot'], 0, -1);
+                }
+                $this->installroot = $options['installroot'];
+                $php_dir = $this->_prependPath($php_dir, $this->installroot);
+            } else {
+                $this->installroot = '';
+            }
+            $this->registry = &new PEAR_Registry($php_dir);
+        }
         $depchecker = &new PEAR_Dependency($this->registry);
         $error = $errors = '';
         $failed_deps = array();