[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-838-g198f045

[? sunnavy]

The branch, 3.9-trunk has been updated
       via  198f04582ea974c37f8190a075e446e74ac5914d (commit)
      from  249bf51d05d51f07c540b94c80d3111959a5ce42 (commit)

Summary of changes:
 lib/RT/Test/Apache.pm |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 198f04582ea974c37f8190a075e446e74ac5914d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Dec 13 20:19:08 2010 +0800

    use apxs to find module prefix of apache

diff --git a/lib/RT/Test/Apache.pm b/lib/RT/Test/Apache.pm
index ce2a2a6..ae40e4c 100644
--- a/lib/RT/Test/Apache.pm
+++ b/lib/RT/Test/Apache.pm
@@ -2,7 +2,18 @@ package RT::Test::Apache;
 use strict;
 use warnings;
 
-my $apache_module_prefix = 'modules';
+my $apache_module_prefix;
+my $apxs =
+     $ENV{RT_TEST_APXS}
+  || RT::Test->find_executable('apxs')
+  || RT::Test->find_executable('apxs2');
+
+if ($apxs) {
+    $apache_module_prefix = `$apxs -q LIBEXECDIR`;
+    chomp $apache_module_prefix;
+}
+
+$apache_module_prefix ||= 'modules';
 
 sub start_server {
     my ($self, $variant, $port, $tmp) = @_;

-----------------------------------------------------------------------