You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/07/15 17:05:16 UTC
cvs commit: modperl/src/modules/perl Makefile
dougm 98/07/15 08:05:14
Modified: . Changes Makefile.PL
src/modules/perl Makefile
Log:
Makefile.PL fix for 'make test' and --enable-shared= modules
applied src/modules/perl/Makefile fixup for ApacheSSL
[Iosif Fettich <if...@netsoft.ro>]
Revision Changes Path
1.75 +5 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Changes 1998/07/14 14:57:04 1.74
+++ Changes 1998/07/15 15:05:12 1.75
@@ -8,6 +8,11 @@
=item 1.13_01-dev
+Makefile.PL fix for 'make test' and --enable-shared= modules
+
+applied src/modules/perl/Makefile fixup for ApacheSSL
+[Iosif Fettich <if...@netsoft.ro>]
+
experimental optimization for Apache::Constants if XS_IMPORT=1 is
given to Makefile.PL:
drop heavy Exporter::import/@EXPORT/@EXPORT_OK/%EXPORT_TAGS for
1.65 +4 -3 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.PL 1998/07/14 14:57:05 1.64
+++ Makefile.PL 1998/07/15 15:05:13 1.65
@@ -164,7 +164,7 @@
my @mp_args =
qw(EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE APACHE_PREFIX
USE_APACI USE_DSO USE_APXS WITH_APXS APACI_ARGS PREP_HTTPD
- ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT);
+ ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT XS_IMPORT);
sub is_mp_arg {
my $arg = shift;
@@ -248,8 +248,8 @@
}
elsif($USE_APACI) {
print "Will configure via APACI";
+ gen_script("apaci/load_modules.pl");
if($USE_DSO) {
- gen_script("apaci/load_modules.pl");
print " (DSO enabled)";
}
$NO_HTTPD = 1 if $PREP_HTTPD;
@@ -1110,8 +1110,9 @@
test: pure_all start_httpd run_tests kill_httpd
);
+ my $have_so = $USE_DSO || ($APACI_ARGS =~ /--enable-shared=/);
push @test_pre_init, "\t",
- './apaci/load_modules.pl $(APACHE_SRC)', "\n" if $USE_DSO;
+ './apaci/load_modules.pl $(APACHE_SRC)', "\n" if $have_so;
join '', @test_pre_init,
qq(
1.8 +2 -2 modperl/src/modules/perl/Makefile
Index: Makefile
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 1998/05/10 04:14:53 1.7
+++ Makefile 1998/07/15 15:05:14 1.8
@@ -50,13 +50,13 @@
#
# Makefile for the Apache mod_perl library
#
-# $Id: Makefile,v 1.7 1998/05/10 04:14:53 dougm Exp $
+# $Id: Makefile,v 1.8 1998/07/15 15:05:14 dougm Exp $
#
#__ORIGINAL__
-INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
+INCLUDES=$(INCLUDES1) $(INCLUDES0) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
SHELL = /bin/sh