From: Tomas V.V.Cox <cox@php.net>
Date: Mon, 16 Jun 2003 17:10:09 +0000 (+0000)
Subject: Expose phpize output
X-Git-Tag: RELEASE_1_0_2~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e72354e18ef26076fee00c620263124aba4e71c2;p=php

Expose phpize output
Increase verbosity for building process by default
(no need for -v)
---

diff --git a/pear/PEAR/Builder.php b/pear/PEAR/Builder.php
index 20bb40c471..13c3f36f60 100644
--- a/pear/PEAR/Builder.php
+++ b/pear/PEAR/Builder.php
@@ -310,7 +310,7 @@ class PEAR_Builder extends PEAR_Common
         if ($what != 'cmdoutput') {
             return;
         }
-        $this->log(3, rtrim($data));
+        $this->log(1, rtrim($data));
         if (preg_match('/You should update your .aclocal.m4/', $data)) {
             return;
         }
@@ -320,8 +320,8 @@ class PEAR_Builder extends PEAR_Common
             $apino = (int)$matches[2];
             if (isset($this->$member)) {
                 $this->$member = $apino;
-                $msg = sprintf("%-22s : %d", $matches[1], $apino);
-                $this->log(1, $msg);
+                //$msg = sprintf("%-22s : %d", $matches[1], $apino);
+                //$this->log(1, $msg);
             }
         }
     }
@@ -352,6 +352,11 @@ class PEAR_Builder extends PEAR_Common
         if (!$pp) {
             return $this->raiseError("failed to run `$command'");
         }
+        if ($callback && $callback[0]->debug == 1) {
+            $olddbg = $callback[0]->debug;
+            $callback[0]->debug = 2;
+        }
+
         while ($line = fgets($pp, 1024)) {
             if ($callback) {
                 call_user_func($callback, 'cmdoutput', $line);
@@ -359,6 +364,9 @@ class PEAR_Builder extends PEAR_Common
                 $this->log(2, rtrim($line));
             }
         }
+        if ($callback && isset($olddbg)) {
+            $callback[0]->debug = $olddbg;
+        }
         $exitcode = @pclose($pp);
         return ($exitcode == 0);
     }