From 4e36c664a5e8c1519a24ecc74b31c641a3e5cc76 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 9 Mar 2010 04:46:02 +0000
Subject: [PATCH] Bug 551104: Don't install DBD::Pg when using
 install-module.pl --all unless the PostgreSQL devel files are actually
 installed. r=mkanat, a=mkanat (module owner)

git-svn-id: svn://10.0.0.236/trunk@259927 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev           | 2 +-
 mozilla/webtools/bugzilla/install-module.pl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 3377350b9d0..79088451294 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7057
\ No newline at end of file
+7058
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/install-module.pl b/mozilla/webtools/bugzilla/install-module.pl
index 44457c400a9..f3c6ba4615d 100755
--- a/mozilla/webtools/bugzilla/install-module.pl
+++ b/mozilla/webtools/bugzilla/install-module.pl
@@ -35,6 +35,7 @@ use Bugzilla::Install::CPAN;
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
+use Bugzilla::Install::Util qw(bin_loc);
 
 use Data::Dumper;
 use Getopt::Long;
@@ -101,6 +102,7 @@ if ($switch{'all'} || $switch{'upgrade-all'}) {
         # configuration, and really should be installed on its own.
         next if $cpan_name eq 'mod_perl2';
         next if $cpan_name eq 'DBD::Oracle' and !$ENV{ORACLE_HOME};
+        next if $cpan_name eq 'DBD::Pg' and !bin_loc('pg_config');
         install_module($cpan_name, $can_notest);
     }
 }