stas 2004/07/01 18:25:52
Modified: lib/ModPerl Config.pm
. Changes
Log:
- add (apr|apu)-config linking info
- show the full path to the config file used to get the data for the
report
Revision Changes Path
1.11 +19 -1 modperl-2.0/lib/ModPerl/Config.pm
Index: Config.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Config.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- Config.pm 4 Mar 2004 06:01:06 -0000 1.10
+++ Config.pm 2 Jul 2004 01:25:52 -0000 1.11
@@ -18,6 +18,9 @@
use Apache::Build ();
use Apache::TestConfig ();
+use File::Spec ();
+
+use constant WIN32 => Apache::Build::WIN32;
sub as_string {
my $build_config = Apache::Build->build_config;
@@ -26,7 +29,8 @@
$cfg .= "*** mod_perl version $mod_perl::VERSION\n\n";;
- $cfg .= "*** using $INC{'Apache/BuildConfig.pm'}\n";
+ my $file = File::Spec->rel2abs($INC{'Apache/BuildConfig.pm'});
+ $cfg .= "*** using $file\n\n";
# the widest key length
my $max_len = 0;
@@ -50,6 +54,20 @@
$cfg .= qx{$command};
} else {
$cfg .= "\n\n*** The httpd binary was not found\n";
+ }
+
+ # apr
+ $cfg .= "\n\n*** (apr|apu)-config linking info\n\n";
+ if (my $apr_bindir = $build_config->apr_bindir()) {
+ my $ext = WIN32 ? '.bat' : '';
+ my @libs = grep $_, map { -x $_ && qx{$_ --link-ld --libs} }
+ map { qq{$apr_bindir/$_-config$ext} } qw(apr apu);
+ chomp @libs;
+ my $libs = join "\n", @libs;
+ $cfg .= "$libs\n\n";
+ }
+ else {
+ $cfg .= "config script were not found\n\n";
}
# perl opts
1.397 +5 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -u -r1.396 -r1.397
--- Changes 1 Jul 2004 21:19:18 -0000 1.396
+++ Changes 2 Jul 2004 01:25:52 -0000 1.397
@@ -12,6 +12,11 @@
=item 1.99_15-dev
+bug reports generating code: [Stas]
+- add (apr|apu)-config linking info
+- show the full path to the config file used to get the data for the
+ report
+
The APR and APR::* family of modules can now be used without having
to load mod_perl.so. On *nix, this is done by compiling the needed
functions from the appropriate sources used to build mod_perl.so
