Randy Kobes
2005-09-09 15:12:58 UTC
For both mp2bug and A-T
Question, why does A-T call it OSX and mp2 call it DARWIN ... should we sync
one way or the other ?
Index: lib/ModPerl/Config.pm
===================================================================
--- lib/ModPerl/Config.pm (revision 279736)
+++ lib/ModPerl/Config.pm (working copy)
@@ -18,9 +18,11 @@
use Apache2::Build ();
use Apache::TestConfig ();
+use Apache::TestConfigData ();
use File::Spec ();
use constant WIN32 => Apache2::Build::WIN32;
+use constant DARWIN => Apache2::Build::WIN32;
sub as_string {
my $build = Apache2::Build->build_config;
@@ -53,8 +55,19 @@
$command = "$httpd -V";
$cfg .= "\n\n*** $command\n";
$cfg .= qx{$command};
- }
- else {
+
+ # Add the dynamic link information
+ # For now, assume its in our path... its there a better way ?
+ if (DARWIN) {
+ $command = "otool $httpd";
+ }
+ else {
+ $command = "ldd $httpd";
+ }
+
+ $cfg .= "\n*** $command\n";
+ $cfg .= qx{$command};
+ } else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
Index: Apache-Test/lib/Apache/TestConfig.pm
===================================================================
--- Apache-Test/lib/Apache/TestConfig.pm (revision 279734)
+++ Apache-Test/lib/Apache/TestConfig.pm (working copy)
@@ -1837,7 +1837,19 @@
$command = "$httpd -V";
$cfg .= "\n*** $command\n";
$cfg .= qx{$command};
- }
+
+ # Add the dynamic link information
+ # For now, assume its in our path... its there a better way ?
+ if (OSX) {
+ $command = "otool $httpd";
+ }
+ else {
+ $command = "ldd $httpd";
+ }
+
+ $cfg .= "\n*** $command\n";
+ $cfg .= qx{$command};
+ }
else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
If this point was reached, it would break Win32, plusQuestion, why does A-T call it OSX and mp2 call it DARWIN ... should we sync
one way or the other ?
Index: lib/ModPerl/Config.pm
===================================================================
--- lib/ModPerl/Config.pm (revision 279736)
+++ lib/ModPerl/Config.pm (working copy)
@@ -18,9 +18,11 @@
use Apache2::Build ();
use Apache::TestConfig ();
+use Apache::TestConfigData ();
use File::Spec ();
use constant WIN32 => Apache2::Build::WIN32;
+use constant DARWIN => Apache2::Build::WIN32;
sub as_string {
my $build = Apache2::Build->build_config;
@@ -53,8 +55,19 @@
$command = "$httpd -V";
$cfg .= "\n\n*** $command\n";
$cfg .= qx{$command};
- }
- else {
+
+ # Add the dynamic link information
+ # For now, assume its in our path... its there a better way ?
+ if (DARWIN) {
+ $command = "otool $httpd";
+ }
+ else {
+ $command = "ldd $httpd";
+ }
+
+ $cfg .= "\n*** $command\n";
+ $cfg .= qx{$command};
+ } else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
Index: Apache-Test/lib/Apache/TestConfig.pm
===================================================================
--- Apache-Test/lib/Apache/TestConfig.pm (revision 279734)
+++ Apache-Test/lib/Apache/TestConfig.pm (working copy)
@@ -1837,7 +1837,19 @@
$command = "$httpd -V";
$cfg .= "\n*** $command\n";
$cfg .= qx{$command};
- }
+
+ # Add the dynamic link information
+ # For now, assume its in our path... its there a better way ?
+ if (OSX) {
+ $command = "otool $httpd";
+ }
+ else {
+ $command = "ldd $httpd";
+ }
+
+ $cfg .= "\n*** $command\n";
+ $cfg .= qx{$command};
+ }
else {
$cfg .= "\n\n*** The httpd binary was not found\n";
}
any other system which didn't have an ldd in the PATH.
Perhaps Apache::TestConfig::which() could be used to
see if an ldd() [or otool()] is present, and skip this
part if it's not found?
--
best regards,
randy
best regards,
randy