cvs commit: modperl-2.0 Makefile.PL
stas2003/01/30 16:52:22 Modified:.Makefile.PL Log: use a portable $(MAKE) instead of just 'make' Revision ChangesPath 1.91 +1 -1 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- Makefile.PL 23 Jan 2003 05:16:30 - 1.90 +++ Makefile.PL 31 Jan 2003 00:52:21 - 1.91 @@ -460,7 +460,7 @@ $(PASSENV) \ $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ t/TEST - cd ModPerl-Registry make test + cd ModPerl-Registry $(MAKE) test test :: pure_all run_tests test_clean EOF
cvs commit: modperl-2.0 Makefile.PL Changes
stas2003/01/22 21:16:30
Modified:.Makefile.PL Changes
Log:
the top level 'make test' now descends into the ModPerl-Registry dir
to run 'make test' there
Revision ChangesPath
1.90 +24 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Makefile.PL 11 Jan 2003 03:20:54 - 1.89
+++ Makefile.PL 23 Jan 2003 05:16:30 - 1.90
@@ -29,7 +29,6 @@
use Apache::TestReportPerl ();
use Apache::TestSmokePerl ();
use Apache::TestTrace;
-use Apache::TestMM qw(test);
use ModPerl::TestRun ();
use ModPerl::Code ();
use ModPerl::MM ();
@@ -442,6 +441,30 @@
ModPerl::MM::add_dep(\$string, clean = 'modperl_src_clean');
ModPerl::MM::add_dep(\$string, clean = 'test_clean');
$string;
+}
+
+sub MY::test {
+
+my $env = Apache::TestConfig-passenv_makestr();
+
+my $preamble = Apache::TestConfig::WIN32 ? : EOF;
+PASSENV = $env
+EOF
+
+return $preamble . 'EOF';
+test_clean :
+ $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
+ t/TEST -clean
+
+run_tests : test_clean
+ $(PASSENV) \
+ $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
+ t/TEST
+ cd ModPerl-Registry make test
+
+test :: pure_all run_tests test_clean
+EOF
+
}
sub MY::postamble {
1.112 +3 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Changes 23 Jan 2003 04:06:38 - 1.111
+++ Changes 23 Jan 2003 05:16:30 - 1.112
@@ -10,6 +10,9 @@
=item 1.99_09-dev
+the top level 'make test' now descend into the ModPerl-Registry dir
+to run 'make test' there [Stas]
+
Apache::Test: don't inherit loading of the mod_perl object from the
system-wide config, since we already add it [Stas]
cvs commit: modperl-2.0 Makefile.PL Changes
stas2002/12/14 20:03:43
Modified:.Makefile.PL Changes
Log:
Strongly suggest win32 users to upgrade to 5.8.0, if they run 5.6.x
Submitted by: Randy Kobes [EMAIL PROTECTED]
Reviewed by: stas
Revision ChangesPath
1.88 +7 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Makefile.PL 29 Jun 2002 19:44:04 - 1.87
+++ Makefile.PL 15 Dec 2002 04:03:43 - 1.88
@@ -298,13 +298,18 @@
sub perl_version_check {
if ($] 5.006_001) {
error You are running Perl version 5.6.0\n .
- We strongly suggest you upgrade to at least 5.6.1;
+We strongly suggest you upgrade to at least 5.6.1;
}
if ($] = 5.007 and $] 5.008) {
error 5.7.x development versions of Perl are no longer supported\n .
- Upgrade to 5.8.0 or higher;
+Upgrade to 5.8.0 or higher;
exit 1;
+}
+
+if (WIN32 and $] 5.008) {
+error You are running a Perl version 5.6.x\n .
+We strongly suggest you upgrade to 5.8\n;
}
}
1.82 +3 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Changes 14 Dec 2002 17:29:34 - 1.81
+++ Changes 15 Dec 2002 04:03:43 - 1.82
@@ -10,6 +10,9 @@
=item 1.99_08-dev
+Strongly suggest win32 users to upgrade to 5.8.0, if they run 5.6.x
+[Randy Kobes [EMAIL PROTECTED]]
+
When installing the mod_perl shared object, first need to check
whether the directory 'modules' already exists, and create it if not.
[Randy Kobes [EMAIL PROTECTED]]
cvs commit: modperl-2.0 Makefile.PL
dougm 2002/06/29 12:44:04 Modified:.Makefile.PL Log: now that APLOG_TOCLIENT is #ifdef-ed, allow compilation with 2.0.35 Revision ChangesPath 1.87 +1 -1 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Makefile.PL 23 Jun 2002 21:46:09 - 1.86 +++ Makefile.PL 29 Jun 2002 19:44:04 - 1.87 -2,7 +2,7 use strict; use warnings FATAL = 'all'; -my $min_httpd_version = '2.0.36'; +my $min_httpd_version = '2.0.35'; my($old_modperl_version, $old_modperl_pm);
cvs commit: modperl-2.0 Makefile.PL
stas02/03/13 08:01:02
Modified:.Makefile.PL
Log:
do yourself a favor, don't use perl v5.6.0
Revision ChangesPath
1.59 +5 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.PL 31 Dec 2001 08:45:13 - 1.58
+++ Makefile.PL 13 Mar 2002 16:01:02 - 1.59
-25,6 +25,11
}
}
+if ($] 5.006001) {
+error You are running Perl version $]\n .
+We strongly suggest to upgrade to at least 5.6.1;
+}
+
my $build = Apache::Build-new(init = 1);
my $code = ModPerl::Code-new;
cvs commit: modperl-2.0 Makefile.PL
stas01/12/25 04:46:10 Modified:.Makefile.PL Log: - correct the changed docs path in the problem description comment Revision ChangesPath 1.57 +1 -1 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- Makefile.PL 2001/12/25 12:44:49 1.56 +++ Makefile.PL 2001/12/25 12:46:10 1.57 @@ -26,7 +26,7 @@ my $code = ModPerl::Code-new; #XXX: dunno why but win32 fails because of this: -#cd docs/src/api/mod_perl-2.0 nmake all ... +#cd docs/api/mod_perl-2.0 nmake all ... #NMAKE : fatal error U1073: don't know how to make 'all' #Stop. #NMAKE : fatal error U1077: 'cd' : return code '0x2'
cvs commit: modperl-2.0 Makefile.PL
stas01/11/20 18:39:45
Modified:.Makefile.PL
Log:
s/generate_xs/xs_generate/ to be consistent with make target and
build/xs_generate.pl
Revision ChangesPath
1.54 +2 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.PL 2001/11/02 17:59:05 1.53
+++ Makefile.PL 2001/11/21 02:39:45 1.54
@@ -113,7 +113,7 @@
if ($build-{MP_GENERATE_XS}) {
print generating XS code using $tables_dir...\n;
-generate_xs($httpd_version);
+xs_generate($httpd_version);
}
}
@@ -148,7 +148,7 @@
my $tables_dir = xs/tables/$tables_version;
}
-sub generate_xs {
+sub xs_generate {
require ModPerl::WrapXS;
my $xs = ModPerl::WrapXS-new;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/11/02 09:31:33
Modified:.Makefile.PL
Log:
no need to check exists $build-{MP_USE_DSO}
Revision ChangesPath
1.51 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile.PL 2001/10/22 18:19:35 1.50
+++ Makefile.PL 2001/11/02 17:31:33 1.51
@@ -319,7 +319,7 @@
my $self = shift;
# install libmodperl.so
-if (exists $build-{MP_USE_DSO} $build-{MP_USE_DSO}) {
+if ($build-{MP_USE_DSO}) {
my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, 'so';
$self-{PM}-{src/modules/perl/$MODPERL_LIB} =
\$(APACHE_LIBDIR)/$MODPERL_LIB;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/22 11:19:35
Modified:.Makefile.PL
Log:
need touch dummy libmodperl.lib for win32 WrapXS/ Makefile.PLs
Revision ChangesPath
1.50 +12 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.PL 2001/10/22 04:51:14 1.49
+++ Makefile.PL 2001/10/22 18:19:35 1.50
@@ -56,6 +56,18 @@
post_configure();
sub configure {
+if (Apache::Build::is_win32()) {
+#Makefile.PL's in WrapXS/ just need to pass the -e libmodperl.lib test
+#the real libmodperl.lib will be in place when WrapXS/ dll's are
+#actually linked
+my $lib = src/modules/perl/$build-{MP_LIBNAME}.lib;
+unless (-e $lib) {
+open my $fh, '', $lib or die open $lib: $!;
+print $fh #this is a dummy file to trick MakeMaker;
+close $fh;
+}
+}
+
system_sanity_check();
set_modperl_version();
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/21 16:07:01
Modified:.Makefile.PL
Log:
always using .so extension for libmodperl
Revision ChangesPath
1.48 +2 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.PL 2001/10/21 06:43:34 1.47
+++ Makefile.PL 2001/10/21 23:07:01 1.48
@@ -299,9 +299,9 @@
sub MY::post_initialize {
my $self = shift;
-# install libmodperl.so, MODPERL_LIB is not known here yet
+# install libmodperl.so
if (exists $build-{MP_USE_DSO} $build-{MP_USE_DSO}) {
-my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, $Config{dlext};
+my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, 'so';
$self-{PM}-{src/modules/perl/$MODPERL_LIB} =
\$(APACHE_LIBDIR)/$MODPERL_LIB;
}
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/17 10:38:07
Modified:.Makefile.PL
Log:
undo undo of explicit DIR in WriteMakefile; problem seems to have gone away
Revision ChangesPath
1.45 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.PL 2001/10/15 16:50:47 1.44
+++ Makefile.PL 2001/10/17 17:38:07 1.45
@@ -27,7 +27,7 @@
ModPerl::MM::WriteMakefile(
NAME = 'mod_perl',
VERSION = $VERSION,
-#DIR = get_dirs_with_makefile(@remote_makefile_dirs),
+DIR = get_dirs_with_makefile(@remote_makefile_dirs),
macro = {
MODPERL_SRC = $code-path,
PERL = $build-perl_config('perlpath'),
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/11 12:48:08
Modified:.Makefile.PL
Log:
add os specific sanity checks starting with hpux
Revision ChangesPath
1.43 +19 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.PL 2001/10/11 03:29:32 1.42
+++ Makefile.PL 2001/10/11 19:48:08 1.43
@@ -181,6 +181,7 @@
$build-lib_check('gdbm');
malloc_check();
+os_check();
}
sub malloc_check {
@@ -200,6 +201,24 @@
}
}
+sub os_check {
+my $check = \{os_check_$^O};
+return unless defined $check;
+$check-()
+}
+
+sub os_check_hpux {
+my $ccflags = $build-perl_config('ccflags');
+
+if ($build-{MP_USE_DSO} and $Config{ld} eq 'ld') {
+unless ($ccflags =~ /\+z/i) {
+$build-phat_warn(EOF);
+mod_perl is unlikely to link with your libperl, suggestions:
+*) Rebuild Perl with Configure -Accflags=+Z ...
+EOF
+}
+}
+}
# by default only Makefile.PL's in the first level sub-dirs are
# discovered. If you want to reach a Makefile.PL's in some remote
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/10 20:29:32
Modified:.Makefile.PL
Log:
the DIR = [] patch does not work, backing it out for now.
Revision ChangesPath
1.42 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.PL 2001/10/09 18:28:37 1.41
+++ Makefile.PL 2001/10/11 03:29:32 1.42
@@ -27,7 +27,7 @@
ModPerl::MM::WriteMakefile(
NAME = 'mod_perl',
VERSION = $VERSION,
-DIR = get_dirs_with_makefile(@remote_makefile_dirs),
+#DIR = get_dirs_with_makefile(@remote_makefile_dirs),
macro = {
MODPERL_SRC = $code-path,
PERL = $build-perl_config('perlpath'),
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/09 11:28:37
Modified:.Makefile.PL
Log:
clean xs/*.def and xs/*.exp
Revision ChangesPath
1.41 +1 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.PL 2001/10/04 10:51:46 1.40
+++ Makefile.PL 2001/10/09 18:28:37 1.41
@@ -140,6 +140,7 @@
my $path = $code-path;
return [@{ $build-clean_files }, @scripts,
+xs/*.exp, xs/*.def,
map { $path/$_} @{ $code-clean_files }];
}
cvs commit: modperl-2.0 Makefile.PL
stas01/09/10 00:00:56
Modified:.Makefile.PL
Log:
- define APACHE_PREFIX/APACHE_LIBDIR Makefile vars for install target
re-use
- install libmodperl.so if built with MP_USE_DSO=1
Revision ChangesPath
1.38 +15 -3 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.PL 2001/08/08 16:38:07 1.37
+++ Makefile.PL 2001/09/10 07:00:56 1.38
@@ -23,9 +23,11 @@
NAME = 'mod_perl',
VERSION = $VERSION,
macro = {
-MODPERL_SRC = $code-path,
-PERL = $build-perl_config('perlpath'),
-MOD_INSTALL = ModPerl::MM::mod_install(),
+MODPERL_SRC = $code-path,
+PERL = $build-perl_config('perlpath'),
+MOD_INSTALL = ModPerl::MM::mod_install(),
+APACHE_PREFIX = $build-apxs('-q' = 'prefix'),
+APACHE_LIBDIR = $build-apxs('-q' = 'libexecdir'),
},
clean = {
FILES = @{ clean_files() },
@@ -193,6 +195,8 @@
package MY;
+use Config;
+
sub MY::top_targets {
my $self = shift;
my $string = $self-MM::top_targets;
@@ -239,6 +243,14 @@
sub MY::post_initialize {
my $self = shift;
+
+# install libmodperl.so, MODPERL_LIB is not known here yet
+if (exists $build-{MP_USE_DSO} $build-{MP_USE_DSO}) {
+my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, $Config{dlext};
+$self-{PM}-{src/modules/perl/$MODPERL_LIB} =
+\$(APACHE_LIBDIR)/$MODPERL_LIB;
+}
+
#up one from the Apache2/ subdir
#so it can be found for 'use Apache2 ()'
$self-{PM}-{'lib/Apache2.pm'} = blib/lib/Apache2.pm;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/20 10:43:04
Modified:.Makefile.PL
Log:
need to push tables_dir into @INC when xs is not generated
Revision ChangesPath
1.34 +11 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.PL 2001/04/12 16:03:55 1.33
+++ Makefile.PL 2001/04/20 17:42:57 1.34
@@ -73,7 +73,14 @@
generate_script($_);
}
-generate_xs($httpd_version) if $build-{MP_GENERATE_XS};
+my $tables_dir = tables_dir($httpd_version);
+
+unshift @INC, $tables_dir;
+
+if ($build-{MP_GENERATE_XS}) {
+print "generating XS code using $tables_dir...\n";
+generate_xs($httpd_version);
+}
}
sub post_configure {
@@ -97,7 +104,7 @@
$build-save;
}
-sub generate_xs {
+sub tables_dir {
my $httpd_version = shift;
my $tables_version = 'current';
@@ -105,10 +112,9 @@
#$httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
my $tables_dir = "xs/tables/$tables_version";
-unshift @INC, $tables_dir;
-
-print "generating XS code using $tables_dir...\n";
+}
+sub generate_xs {
require ModPerl::WrapXS;
my $xs = ModPerl::WrapXS-new;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/12 09:03:55 Modified:.Makefile.PL Log: make sure test files a cleaned Revision ChangesPath 1.33 +1 -0 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Makefile.PL 2001/04/11 23:00:56 1.32 +++ Makefile.PL 2001/04/12 16:03:55 1.33 @@ -234,6 +234,7 @@ my $self = shift; my $string = $self-MM::clean(@_); ModPerl::MM::add_dep(\$string, clean = 'modperl_src_clean'); +ModPerl::MM::add_dep(\$string, clean = 'test_clean'); $string; }
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/02 02:17:41
Modified:.Makefile.PL
Log:
hook into test stuff
Revision ChangesPath
1.30 +23 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.PL 2001/03/27 02:32:49 1.29
+++ Makefile.PL 2001/04/02 09:17:40 1.30
@@ -3,15 +3,20 @@
use warnings FATAL = 'all';
use lib qw(lib);
+use Config;
use Apache::Build ();
use ModPerl::Code ();
use ModPerl::MM ();
+use lib qw(Apache-Test/lib);
+use Apache::TestMM qw(test);
+
our $VERSION;
my $build = Apache::Build-new(init = 1);
my $code = ModPerl::Code-new;
+my @scripts = qw(t/TEST);
configure();
ModPerl::MM::WriteMakefile(
@@ -58,6 +63,10 @@
#ModPerl::MM will use Apache::BuildConfig in subdir/Makefile.PL's
$build-save;
+for (@scripts) {
+generate_script($_);
+}
+
generate_xs($httpd_version) if $build-{MP_GENERATE_XS};
}
@@ -103,6 +112,19 @@
shift @INC;
}
+sub generate_script {
+my $file = shift;
+open my $in, "$file.PL" or die "Couldn't open $file.PL: $!";
+open my $out, '', $file or die "Couldn't open $file: $!";
+print "generating script...$file\n";
+print $out "#!$Config{perlpath}\n",
+ "# WARNING: this file is generated, edit $file.PL instead\n",
+ join '', $in;
+close $out or die "close $file: $!";
+close $in;
+chmod 0544, $file;
+}
+
sub echo_cmd {
my $cmd = shift;
print "$cmd\n";
@@ -112,7 +134,7 @@
sub clean_files {
my $path = $code-path;
-return [@{ $build-clean_files },
+return [@{ $build-clean_files }, @scripts,
map { "$path/$_"} @{ $code-clean_files }];
}
cvs commit: modperl-2.0 Makefile.PL
dougm 01/03/26 18:32:50
Modified:.Makefile.PL
Log:
only one version of the source tables is currently supported, so just hardwire it
for now
Revision ChangesPath
1.29 +3 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.PL 2001/03/26 22:07:12 1.28
+++ Makefile.PL 2001/03/27 02:32:49 1.29
@@ -85,8 +85,9 @@
sub generate_xs {
my $httpd_version = shift;
-my $tables_version =
- $httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
+my $tables_version = 'current';
+#XXX: support versioning
+#$httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
my $tables_dir = "xs/tables/$tables_version";
unshift @INC, $tables_dir;
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/26 00:28:45 Modified:.Makefile.PL Log: save $build after Makefile is generated Revision ChangesPath 1.16 +3 -3 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.PL 2000/04/25 05:16:07 1.15 +++ Makefile.PL 2000/04/26 07:28:45 1.16 @@ -50,12 +50,12 @@ printf "Configuring Apache/%s mod_perl/%s Perl/v%vd\n", $httpd_version, $VERSION, $^V; -$build-save; -$build-save_ldopts; - $code-generate; $build-write_src_makefile; + +$build-save; +$build-save_ldopts; printf "Will build mod_perl %s as %s\n", $build-is_dynamic ? "shared" : "static",
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/24 21:25:42
Modified:lib/Apache Build.pm
.Makefile.PL
Log:
workaround MakeMaker braindeadness
Revision ChangesPath
1.11 +5 -2 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Build.pm 2000/04/21 19:43:34 1.10
+++ Build.pm 2000/04/25 04:25:40 1.11
@@ -341,16 +341,19 @@
(my $obj = $self-freeze) =~ s/^//;
open my $fh, '', $file or die "open $file: $!";
+#work around autosplit braindeadness
+my $package = 'package Apache::BuildConfig';
+
print $fh EOF;
-package Apache::BuildConfig;
+$package;
use Apache::Build ();
+
sub new {
$obj;
}
1;
-__END__
EOF
close $fh;
1.14 +1 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.PL 2000/04/25 03:47:31 1.13
+++ Makefile.PL 2000/04/25 04:25:41 1.14
@@ -26,6 +26,7 @@
VERSION = $VERSION,
macro = {
MODPERL_SRC = $code-path,
+PERL = $build-perl_config('perl5'),
},
clean = {
FILES = "@{ clean_files() }",
