|
|
Author: particle
Date: Thu Jul 24 07:40:41 2008
New Revision: 374
Modified:
mod_parrot/branches/configure/Configure.pl
Log:
[config] add comments for possible step names, jhorwitz++
Modified: mod_parrot/branches/configure/Configure.pl
==============================================================================
--- mod_parrot/branches/configure/Configure.pl (original)
+++ mod_parrot/branches/configure/Configure.pl Thu Jul 24 07:40:41 2008
@@ -253,6 +253,7 @@
## parts stolen from mod_perl
+## step init::defaults
my %threaded_mpms = map { $_ => 1}
qw(worker winnt beos mpmt_os2 netware leader perchild threadpool);
@@ -265,6 +266,8 @@
my $apxs = '/usr/local/apache/bin/apxs';
my $perl = $^X;
+
+## step commandline config
my $res = GetOptions(
'parrot-build-dir=s' => \$parrot_build_dir,
'apxs=s' => \$apxs
@@ -290,6 +293,8 @@
# debugging flags for developers
my $debug = $ENV{'MP_DEBUG'};
+
+## step probe::apache
# apache configs
my $apache_include_dir = `$apxs -q INCLUDEDIR`;
my $apr_include_dir = `$apxs -q APR_INCLUDEDIR`;
@@ -305,14 +310,19 @@
chomp($mpm);
print "Configuring mod_parrot for $mpm MPM.\n";
+
# we can't use the config verbatim -- apxs chokes on it, so we use what we can
my $cflags = " -I$parrot_build_dir/include -Iinclude";
$cflags .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
+
+## step probe::parrot
my $libs = parrot_config('libs') . " -lparrot";
my $blib_dir = parrot_config('blib_dir');
my $ldflags = parrot_config('libparrot_ldflags') .
" -R$parrot_build_dir/$blib_dir";;
+
+## step gen::makefile
print "Generating Makefile...";
my $template;
{
@@ -344,6 +354,8 @@
close(MAKEFILE);
print "done.\n";
+
+## step gen::apache_test_config
print "Creating testing infrastructure...";
eval "use Apache::Test 1.26";
unless ($@) {
@@ -372,4 +384,6 @@
print "Skipping test setup!\n";
}
+
+## step whatever
print "\nType 'make' to build mod_parrot.\n\n";
|
|