Revert "Merge remote branch 'cros/upstream' into tempbranch2"

client/deps/pgpool/pgpool.py

Index: client/deps/pgpool/pgpool.py
diff --git a/client/deps/pgpool/pgpool.py b/client/deps/pgpool/pgpool.py
index 1c52bfbec38f87f7964a3e7748a0c70c0fdbb266..c4caab56cbaa19e985b6ab0d316658b99a735e5b 100755
--- a/client/deps/pgpool/pgpool.py
+++ b/client/deps/pgpool/pgpool.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import os
+import common
 from autotest_lib.client.bin import utils
 
 version = 1
@@ -15,10 +16,10 @@ def setup(tarball, topdir):
     os.chdir(srcdir)
     # FIXEME - Waiting to be able to use self.autodir instead of
     # os.environ['AUTODIR']
-    utils.configure('--prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \
+    utils.system('./configure --prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \
                     % (topdir, os.environ['AUTODIR']))
-    utils.make('-j %d' % utils.count_cpus())
-    utils.make('install')
+    utils.system('make -j %d' % utils.count_cpus())
+    utils.system('make install')
 
     os.chdir(topdir)