cvs commit: modperl-2.0/ModPerl-Registry/lib/ModPerl RegistryBB.pm Registry.pm
stas02/05/21 22:41:48 Modified:ModPerl-Registry/lib/ModPerl RegistryBB.pm Registry.pm Log: the pod part moves into its own file Revision ChangesPath 1.2 +0 -14 modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryBB.pm Index: RegistryBB.pm === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryBB.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RegistryBB.pm 9 Oct 2001 12:47:38 - 1.1 +++ RegistryBB.pm 22 May 2002 05:41:48 - 1.2 @@ -24,17 +24,3 @@ 1; __END__ - -=head1 NAME - -ModPerl::RegistryBB - - -=head1 SYNOPSIS - -=head1 DESCRIPTION - -C uses all the defaults, which do the very minimum -to compile the file once and run it many times. - -=cut - 1.2 +1 -1 modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm Index: Registry.pm === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Registry.pm 9 Oct 2001 12:47:38 - 1.1 +++ Registry.pm 22 May 2002 05:41:48 - 1.2 @@ -61,7 +61,7 @@ # # META: if the ISA search results are cached on the first lookup, may -# be need to alias only the those that aren't the defaults? +# be we need to alias only those methods that override the defaults? 1;
cvs commit: modperl-2.0/ModPerl-Registry/t/conf extra.conf.in
stas02/05/21 22:40:48 Modified:ModPerl-Registry MANIFEST ModPerl-Registry/t basic.t closure.t special_blocks.t ModPerl-Registry/t/conf extra.conf.in Removed: ModPerl-Registry/lib/ModPerl RegistryNG.pm Log: Apache::RegistryNG is now ModPerl::Registry, no need for NG version anymore Revision ChangesPath 1.3 +0 -1 modperl-2.0/ModPerl-Registry/MANIFEST Index: MANIFEST === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/MANIFEST,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MANIFEST 11 Oct 2001 19:50:20 - 1.2 +++ MANIFEST 22 May 2002 05:40:48 - 1.3 @@ -6,7 +6,6 @@ lib/ModPerl/Registry.pm lib/ModPerl/RegistryBB.pm lib/ModPerl/RegistryCooker.pm -lib/ModPerl/RegistryNG.pm t/TEST.PL t/basic.t t/closure.t 1.5 +0 -1 modperl-2.0/ModPerl-Registry/t/basic.t Index: basic.t === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/basic.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- basic.t 5 Apr 2002 18:44:39 - 1.4 +++ basic.t 22 May 2002 05:40:48 - 1.5 @@ -8,7 +8,6 @@ my %modules = (registry=> 'ModPerl::Registry', - registry_ng => 'ModPerl::RegistryNG', registry_bb => 'ModPerl::RegistryBB', perlrun => 'ModPerl::PerlRun', ); 1.5 +1 -1 modperl-2.0/ModPerl-Registry/t/closure.t Index: closure.t === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/closure.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- closure.t 19 Oct 2001 06:52:57 - 1.4 +++ closure.t 22 May 2002 05:40:48 - 1.5 @@ -13,7 +13,7 @@ # interpreter all the time (in case that the server is running more # than one interpreter) -my @modules = qw(registry registry_ng registry_bb perlrun); +my @modules = qw(registry registry_bb perlrun); plan tests => 6; 1.4 +0 -1 modperl-2.0/ModPerl-Registry/t/special_blocks.t Index: special_blocks.t === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/special_blocks.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- special_blocks.t 14 May 2002 15:47:12 - 1.3 +++ special_blocks.t 22 May 2002 05:40:48 - 1.4 @@ -9,7 +9,6 @@ my %modules = ( registry=> 'ModPerl::Registry', -registry_ng => 'ModPerl::RegistryNG', registry_bb => 'ModPerl::RegistryBB', perlrun => 'ModPerl::PerlRun', ); 1.5 +0 -19 modperl-2.0/ModPerl-Registry/t/conf/extra.conf.in Index: extra.conf.in === RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/conf/extra.conf.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extra.conf.in 14 May 2002 15:55:21 - 1.4 +++ extra.conf.in 22 May 2002 05:40:48 - 1.5 @@ -31,20 +31,10 @@ ### Normal registry setup ### # Alias /registry/ @ServerRoot@/cgi-bin/ -Alias /registry_ng/ @ServerRoot@/cgi-bin/ Alias /registry_bb/ @ServerRoot@/cgi-bin/ Alias /registry_oo_conf/ @ServerRoot@/cgi-bin/ Alias /perlrun/ @ServerRoot@/cgi-bin/ -PerlModule ModPerl::RegistryNG - -PerlOptions +GlobalRequest -SetHandler perl-script -Options +ExecCGI -PerlResponseHandler ModPerl::RegistryNG -PerlOptions +ParseHeaders - - PerlModule ModPerl::RegistryBB PerlOptions +GlobalRequest @@ -86,20 +76,11 @@ ### Alias /same_interp/registry/ @ServerRoot@/cgi-bin/ -Alias /same_interp/registry_ng/ @ServerRoot@/cgi-bin/ Alias /same_interp/registry_bb/ @ServerRoot@/cgi-bin/ Alias /same_interp/registry_oo_conf/ @ServerRoot@/cgi-bin/ Alias /same_interp/perlrun/ @ServerRoot@/cgi-bin/ PerlModule Apache::TestHandler - -PerlOptions +GlobalRequest -SetHandler perl-script -Options +ExecCGI -PerlFixupHandler Apache::TestHandler::same_interp_fixup -PerlResponseHandler ModPerl::RegistryNG -PerlOptions +ParseHeaders - PerlOptions +GlobalRequest
cvs commit: modperl-2.0 Makefile.PL
dougm 02/05/21 19:07:08
Modified:.Makefile.PL
Log:
s/Apache::Build::WIN32/WIN32/g
Revision ChangesPath
1.83 +5 -3 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- Makefile.PL 22 May 2002 01:58:59 - 1.82
+++ Makefile.PL 22 May 2002 02:07:08 - 1.83
@@ -34,6 +34,8 @@
use ModPerl::Code ();
use ModPerl::MM ();
+use constant WIN32 => Apache::Build::WIN32;
+
our $VERSION;
if (Apache::Build::REQUIRE_ITHREADS()) {
@@ -56,7 +58,7 @@
#Stop.
#NMAKE : fatal error U1077: 'cd' : return code '0x2'
#Stop.
-my @remote_makefile_dirs = Apache::Build::WIN32() ? () :
+my @remote_makefile_dirs = WIN32() ? () :
qw(docs/api/mod_perl-2.0);
configure();
@@ -111,7 +113,7 @@
}
}
-if (Apache::Build::WIN32()) {
+if (WIN32()) {
#Makefile.PL's in WrapXS/ just need to pass the -e mod_perl.lib test
#the real mod_perl.lib will be in place when WrapXS/ dll's are
#actually linked
@@ -295,7 +297,7 @@
}
sub system_sanity_check {
-return if Apache::Build::WIN32;
+return if WIN32;
my $ccflags = $build->perl_config('ccflags');
for (split /\s+/, $ccflags) {
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 02/05/21 18:59:00
Modified:.Makefile.PL
lib/Apache Build.pm
Log:
make it possible to change the name of src/modules/perl/Makefile
in case static build requires a src/modules/perl/Makefile.in
Revision ChangesPath
1.82 +12 -8 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile.PL 21 May 2002 16:19:51 - 1.81
+++ Makefile.PL 22 May 2002 01:58:59 - 1.82
@@ -23,6 +23,7 @@
use File::Spec::Functions;
use DirHandle ();
use File::Copy 'cp';
+use File::Basename 'basename';
use Apache::Build ();
use Apache::TestReportPerl ();
@@ -70,11 +71,14 @@
VERSION => $VERSION,
DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
-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'),
+MODPERL_SRC => $code->path,
+MODPERL_MAKEFILE => basename($build->default_file('makefile')),
+MAKE_F => '$(MAKE) ' . (WIN32 ? '/f' : '-f'),
+MODPERL_LIBMAKE => '$(MAKE) -f $(MODPERL_MAKEFILE)',
+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() }",
@@ -390,13 +394,13 @@
$(SHELL) build/make_etags
modperl_lib:
- cd "$(MODPERL_SRC)" && $(MAKE)
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE)
modperl_lib_install:
- cd "$(MODPERL_SRC)" && $(MAKE) install
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install
modperl_src_clean:
- cd "$(MODPERL_SRC)" && $(MAKE) clean
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean
EOF
1.91 +6 -3 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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Build.pm 21 May 2002 17:42:39 - 1.90
+++ Build.pm 22 May 2002 01:58:59 - 1.91
@@ -9,6 +9,7 @@
use Config;
use Cwd ();
use File::Spec ();
+use File::Basename;
use ExtUtils::Embed ();
use ModPerl::Code ();
use ModPerl::BuildOptions ();
@@ -450,7 +451,7 @@
my %default_files = (
'build_config' => 'lib/Apache/BuildConfig.pm',
'ldopts' => 'src/modules/perl/ldopts',
-'makefile' => 'src/modules/perl/Makefile',
+'makefile' => 'src/modules/perl/Makefile.modperl',
);
sub clean_files {
@@ -908,6 +909,8 @@
print $fh noedit_warning_hash();
+print $fh $self->canon_make_attr('makefile', basename $mf);
+
$self->make_tools($fh);
print $fh $self->canon_make_attr('ap_libs', $self->apache_libs);
@@ -1006,8 +1009,8 @@
$(MODPERL_CLEAN_FILES) \
$(MODPERL_XS_CLEAN_FILES)
-$(MODPERL_OBJS): $(MODPERL_H_FILES) Makefile
-$(MODPERL_PIC_OBJS): $(MODPERL_H_FILES) Makefile
+$(MODPERL_OBJS): $(MODPERL_H_FILES) $(MODPERL_MAKEFILE)
+$(MODPERL_PIC_OBJS): $(MODPERL_H_FILES) $(MODPERL_MAKEFILE)
$(MODPERL_LIB): $(MODPERL_LIBPERL)
$(MODPERL_LIBNAME)$(MODPERL_LIB_EXT): $(MODPERL_OBJS)
cvs commit: modperl-2.0/t/response/TestAPR uuid.pm
dougm 02/05/21 17:55:40
Modified:t/response/TestAPR uuid.pm
Log:
apr_generate_random_bytes may block forever on /dev/random
so disable APR::UUID->new test for the moment
Revision ChangesPath
1.3 +5 -1 modperl-2.0/t/response/TestAPR/uuid.pm
Index: uuid.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/uuid.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uuid.pm 11 Apr 2002 11:08:44 - 1.2
+++ uuid.pm 22 May 2002 00:55:40 - 1.3
@@ -9,12 +9,16 @@
use Apache::Const -compile => 'OK';
+my $dummy_uuid = 'd48889bb-d11d-b211-8567-ec81968c93c6';
+
sub handler {
my $r = shift;
plan $r, tests => 3;
-my $uuid = APR::UUID->new->format;
+#XXX: apr_generate_random_bytes may block forever on /dev/random
+#my $uuid = APR::UUID->new->format;
+my $uuid = $dummy_uuid;
ok $uuid;
cvs commit: modperl-2.0/lib/ModPerl MM.pm
dougm 02/05/21 10:42:39
Modified:lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
get MP_STATIC_EXTS=1 working again
Revision ChangesPath
1.90 +6 -3 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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Build.pm 21 May 2002 16:59:02 - 1.89
+++ Build.pm 21 May 2002 17:42:39 - 1.90
@@ -744,7 +744,7 @@
'$(MODPERL_PRIVLIBEXP)/ExtUtils/xsubpp',
'-typemap', '$(MODPERL_PRIVLIBEXP)/ExtUtils/typemap';
-my $typemap = $self->file_path('src/modules/perl/typemap');
+my $typemap = $self->file_path('lib/typemap');
if (-e $typemap) {
$xsubpp .= join ' ',
' -typemap', $typemap;
@@ -764,8 +764,11 @@
my @xs_targ;
while (my($name, $xs) = each %{ $self->{XS} }) {
-#Foo/Bar.xs => Bar.c
-(my $c = $xs) =~ s:.*/(\w+)\.xs$:$1.c:;
+#Foo/Bar.xs => Foo_Bar.c
+(my $c = $xs) =~ s:.*?WrapXS/::;
+$c =~ s:/:_:g;
+$c =~ s:\.xs$:.c:;
+
push @files, $c;
push @xs_targ, <
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 02/05/21 09:59:02
Modified:lib/Apache Build.pm
Log:
add ap_prefix_is_source_tree method
Revision ChangesPath
1.89 +9 -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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Build.pm 21 May 2002 16:49:53 - 1.88
+++ Build.pm 21 May 2002 16:59:02 - 1.89
@@ -68,6 +68,14 @@
return '';
}
+sub ap_prefix_is_source_tree {
+my $self = shift;
+
+my $prefix = $self->{MP_AP_PREFIX};
+
+-d $prefix and -e "$prefix/CHANGES";
+}
+
sub apxs {
my $self = shift;
@@ -1049,8 +1057,7 @@
push @inc, $self->mp_include_dir;
-my $prefix = $self->{MP_AP_PREFIX};
-if (-d $prefix and not -e "$prefix/CHANGES") {
+unless ($self->ap_prefix_is_source_tree) {
my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
if (-d $ainc) {
push @inc, $ainc;
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 02/05/21 09:49:53
Modified:lib/Apache Build.pm
Log:
dont bother looking for the ssl includes, we dont use them
Revision ChangesPath
1.88 +0 -7 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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Build.pm 21 May 2002 16:48:29 - 1.87
+++ Build.pm 21 May 2002 16:49:53 - 1.88
@@ -1066,13 +1066,6 @@
push @inc, $_ if -d $_;
}
-my $ssl_dir = "$src/../ssl/include";
-unless (-d $ssl_dir) {
-my $build = $self->build_config;
-$ssl_dir = join '/', $self->{MP_SSL_BASE} || '', 'include';
-}
-push @inc, $ssl_dir if -d $ssl_dir;
-
return \@inc;
}
cvs commit: modperl-2.0/lib/ModPerl BuildOptions.pm
dougm 02/05/21 09:48:29
Modified:lib/Apache Build.pm
lib/ModPerl BuildOptions.pm
Log:
allow MP_AP_PREFIX to be a source tree directory
Revision ChangesPath
1.87 +10 -9 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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Build.pm 21 May 2002 16:19:51 - 1.86
+++ Build.pm 21 May 2002 16:48:29 - 1.87
@@ -65,10 +65,6 @@
return "include/ directory not found in $prefix";
}
-if (-e "$prefix/CHANGES") {
-return "$prefix is a build directory (need an install directory)";
-}
-
return '';
}
@@ -556,7 +552,7 @@
return $self->{dir} if $self->{dir};
-if(IS_MOD_PERL_BUILD) {
+if (IS_MOD_PERL_BUILD) {
my $build = $self->build_config;
if ($dir = $build->{'dir'}) {
@@ -566,6 +562,8 @@
}
}
+$dir ||= $self->{MP_AP_PREFIX};
+
# we not longer install Apache headers, so dont bother looking in @INC
# might end up finding 1.x headers anyhow
#unless ($dir and -d $dir) {
@@ -1051,10 +1049,13 @@
push @inc, $self->mp_include_dir;
-my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
-if (-d $ainc) {
-push @inc, $ainc;
-return \@inc;
+my $prefix = $self->{MP_AP_PREFIX};
+if (-d $prefix and not -e "$prefix/CHANGES") {
+my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
+if (-d $ainc) {
+push @inc, $ainc;
+return \@inc;
+}
}
for ("$src/modules/perl", "$src/include",
1.16 +1 -1 modperl-2.0/lib/ModPerl/BuildOptions.pm
Index: BuildOptions.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BuildOptions.pm 21 May 2002 16:19:51 - 1.15
+++ BuildOptions.pm 21 May 2002 16:48:29 - 1.16
@@ -164,7 +164,7 @@
OPTIONS_FILE Read options from given file
STATIC_EXTS Build Apache::*.xs as static extensions
APXSPath to apxs
-AP_PREFIXApache installation prefix
+AP_PREFIXApache installation or source tree prefix
XS_GLUE_DIR Directories containing extension glue
INCLUDE_DIR Add directories to search for header files
GENERATE_XS Generate XS code based on httpd version
cvs commit: modperl-2.0/lib/ModPerl BuildOptions.pm
dougm 02/05/21 09:19:51
Modified:.Makefile.PL
lib/Apache Build.pm
lib/ModPerl BuildOptions.pm
Log:
enable both MP_USE_{DSO,STATIC} by default, specifying one turns off the other.
Revision ChangesPath
1.81 +7 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Makefile.PL 19 May 2002 19:46:08 - 1.80
+++ Makefile.PL 21 May 2002 16:19:51 - 1.81
@@ -203,13 +203,15 @@
$code->generate($build);
-warning sprintf "mod_perl will be built %s as %s",
- $build->is_dynamic ? "shared" : "static",
-$build->{"MODPERL_LIB"};
+for my $type (qw(DSO STATIC)) {
+next unless $build->{"MP_USE_$type"};
+warning "mod_perl \L$type\E library will be built as ".
+ $build->{"MODPERL_LIB_$type"};
+}
if ($build->is_dynamic) {
warning "You'll need to add the following to httpd.conf:",
-" LoadModule perl_module modules/$build->{MODPERL_LIB}\n";
+" LoadModule perl_module modules/$build->{MODPERL_LIB_DSO}\n";
}
if ($build->{MP_INST_APACHE2}) {
@@ -337,7 +339,7 @@
sub os_check_hpux {
my $ccflags = $build->perl_config('ccflags');
-if ($build->{MP_USE_DSO} and $Config{ld} eq 'ld') {
+if ($build->is_dynamic and $Config{ld} eq 'ld') {
unless ($ccflags =~ /\+z/i) {
$build->phat_warn(<{MP_USE_DSO} || $self->{MP_USE_APXS};
-}
+sub is_dynamic { shift->{MP_USE_DSO} }
sub default_dir {
my $build = shift->build_config;
@@ -909,13 +906,17 @@
print $fh $self->canon_make_attr('libname', $self->{MP_LIBNAME});
print $fh $self->canon_make_attr('dlext', 'so'); #always use .so
-print $fh $self->canon_make_attr('lib_shared',
- "$self->{MP_LIBNAME}.$self->{MODPERL_DLEXT}");
-
-print $fh $self->canon_make_attr('lib_static',
- "$self->{MP_LIBNAME}$self->{MODPERL_LIB_EXT}");
+my %libs = (
+dso=> "$self->{MP_LIBNAME}.$self->{MODPERL_DLEXT}",
+static => "$self->{MP_LIBNAME}$self->{MODPERL_LIB_EXT}",
+);
+#XXX short-term compat for Apache::TestConfigPerl
+$libs{shared} = $libs{dso};
+while (my($type, $lib) = each %libs) {
+print $fh $self->canon_make_attr("lib_$type", $libs{$type});
+}
print $fh $self->canon_make_attr('libperl',
join '/',
@@ -931,9 +932,12 @@
print $fh $self->canon_make_attr($method, @{ $code->$method() });
}
-print $fh $self->canon_make_attr('lib', $self->is_dynamic ?
- $self->{MODPERL_LIB_SHARED} :
- $self->{MODPERL_LIB_STATIC});
+my @libs;
+for my $type (map { uc } keys %libs) {
+push @libs, $self->{"MODPERL_LIB_$type"} if $self->{"MP_USE_$type"};
+}
+
+print $fh $self->canon_make_attr('lib', "@libs");
for my $q (qw(LIBEXECDIR)) {
print $fh $self->canon_make_attr("AP_$q",
@@ -956,8 +960,8 @@
lib: $(MODPERL_LIB)
install:
- $(MODPERL_TEST_F) $(MODPERL_LIB_SHARED) && \
- $(MODPERL_CP) $(MODPERL_LIB_SHARED) $(MODPERL_AP_LIBEXECDIR)
+ $(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \
+ $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
.SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
1.15 +4 -1 modperl-2.0/lib/ModPerl/BuildOptions.pm
Index: BuildOptions.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BuildOptions.pm 6 Apr 2002 16:24:51 - 1.14
+++ BuildOptions.pm 21 May 2002 16:19:51 - 1.15
@@ -24,7 +24,10 @@
$build->{MP_USE_GTOP} = 0 unless $build->find_dlfile('gtop');
}
-$build->{MP_USE_DSO} = 1 unless $build->{MP_USE_STATIC};
+unless ($build->{MP_USE_DSO} or $build->{MP_USE_STATIC}) {
+$build->{MP_USE_DSO} = $build->{MP_USE_STATIC} = 1;
+}
+
$build->{MP_GENERATE_XS} = 1 unless exists $build->{MP_GENERATE_XS};
}
