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/20 18:16:32 UTC
cvs commit: modperl/apaci find_source.PL .cvsignore configure
dougm 98/07/20 09:16:32
Modified: . .cvsignore Changes MANIFEST Makefile.PL ToDo
apache-modlist.html
apaci .cvsignore configure
Added: apaci find_source.PL
Log:
USE_APXS fixups:
-use apaci/find_source instead of hard-coding files in apaci/configure
-re-gen apaci/mod_perl.config before running apache/configure
-chmod 0644, apaci/mod_perl.config
Revision Changes Path
1.7 +1 -0 modperl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/modperl/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 1998/07/12 21:21:33 1.6
+++ .cvsignore 1998/07/20 16:16:28 1.7
@@ -30,3 +30,4 @@
t/docs/hooks.txt
Log/Makefile
Log/pm_to_blib
+apaci/find_source
1.85 +8 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Changes 1998/07/18 23:37:04 1.84
+++ Changes 1998/07/20 16:16:28 1.85
@@ -6,6 +6,14 @@
=over 3
+=item 1.14_01-dev
+
+USE_APXS fixups:
+
+ -use apaci/find_source instead of hard-coding files in apaci/configure
+ -re-gen apaci/mod_perl.config before running apache/configure
+ -chmod 0644, apaci/mod_perl.config
+
=item 1.14 - July 18, 1998
PERL_DEBUG=1 w/ USE_APACI=1 will properly link against libperld if exists
1.29 +2 -0 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /export/home/cvs/modperl/MANIFEST,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MANIFEST 1998/07/18 18:04:58 1.28
+++ MANIFEST 1998/07/20 16:16:28 1.29
@@ -186,8 +186,10 @@
apaci/mod_perl.config
apaci/mod_perl.config.sh
apaci/load_modules.pl.PL
+apaci/find_source.PL
.gdbinit
INSTALL.simple
INSTALL.simple.ssl
INSTALL.simple.stronghold
t/docs/subr/.exists
+
1.72 +9 -5 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Makefile.PL 1998/07/18 23:15:55 1.71
+++ Makefile.PL 1998/07/20 16:16:28 1.72
@@ -55,6 +55,7 @@
gen_script("t/net/perl/cgi.pl");
gen_script("t/report");
+gen_script("apaci/find_source");
write_version_h("src/modules/perl");
if($] < 5.004_04) {
@@ -311,11 +312,6 @@
$NO_HTTPD = 1;
}
-if($USE_APXS) {
- my $cmd = "./configure --with-perl=$^X";
- $cmd .= " --with-apxs=$WITH_APXS" if $WITH_APXS;
- system "(cd apaci && $cmd)";
-}
unless ($NO_HTTPD && !$PREP_HTTPD) {
for $src_dir ($APACHE_SRC, <../apache*/src>,
@@ -807,6 +803,13 @@
print "(cd $APACHE_ROOT && $cmd)\n";
system "(cd $APACHE_ROOT && $cmd)";
}
+
+ if($USE_APXS) {
+ my $cmd = "./configure --with-perl=$^X";
+ $cmd .= " --with-apxs=$WITH_APXS" if $WITH_APXS;
+ system "(cd apaci && $cmd)";
+ }
+
#expand ./t to full path
iedit "t/conf/httpd.conf", "s: \./t(\S*): $PWD/t\$1:";
@@ -1725,6 +1728,7 @@
my $lib_cfg;
if($USE_APXS) {
$lib_cfg = "apaci/mod_perl.config";
+ chmod 0644, $lib_cfg;
}
elsif($USE_APACI) {
$lib_cfg = "$APACHE_SRC/modules/perl/mod_perl.config";
1.47 +2 -0 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ToDo 1998/07/18 14:44:13 1.46
+++ ToDo 1998/07/20 16:16:28 1.47
@@ -16,6 +16,8 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
+- fix Makefile.PL when answering 'n' to build httpd, but 'y' to configure
+
- /perl/perl-status?sig dumps core under hpux 10.20
[David-Michael.Lincke@unisg.ch]
1.29 +3 -3 modperl/apache-modlist.html
Index: apache-modlist.html
===================================================================
RCS file: /export/home/cvs/modperl/apache-modlist.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apache-modlist.html 1998/07/18 14:44:13 1.28
+++ apache-modlist.html 1998/07/20 16:16:29 1.29
@@ -2,13 +2,13 @@
<head>
<title>The Apache/Perl Module List</title>
<!-- Changed by: Gerald Richter, 17-Jul-1998 -->
-<!-- Changed by: Doug MacEachern, 18-Jul-1998 -->
+<!-- Changed by: Doug MacEachern, 20-Jul-1998 -->
</head>
<body>
<h1>The Apache/Perl Module List</h1>
Maintained by <a href="mailto:dougm@pobox.com">Doug MacEachern</a>,
-<br><i> $Revision: 1.28 $ $Date: 1998/07/18 14:44:13 $</i>
+<br><i> $Revision: 1.29 $ $Date: 1998/07/20 16:16:29 $</i>
<h3>Contents</h3>
<a href="#intro">Introduction</a><br>
@@ -202,7 +202,7 @@
RegistryLoader bmpf Apache::Registry startup script loader APML
Request bmpO CGI.pm functionality using API methods LDS
Safe ampO Adaptation of "safecgiperl" APML
-Session ampO Maintain client <-> httpd session/state JBAKER
+Session bmpO Maintain client <-> httpd session/state JBAKER
SIG amoO Signal handlers for mod_perl APML
State i Powerful state engine RSE
1.2 +1 -0 modperl/apaci/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/modperl/apaci/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/06/09 16:53:09 1.1
+++ .cvsignore 1998/07/20 16:16:30 1.2
@@ -1 +1,2 @@
load_modules.pl
+find_source
1.5 +1 -1 modperl/apaci/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/modperl/apaci/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure 1998/06/18 06:07:41 1.4
+++ configure 1998/07/20 16:16:31 1.5
@@ -20,7 +20,7 @@
my_makefileconf="Makefile"
my_makefiletmpl="Makefile.tmpl"
my_sourcedir="../src/modules/perl"
-my_sourcefiles="mod_perl.c mod_perl.h perl_config.c perl_util.c perlio.c Apache.xs Constants.xs ModuleConfig.xs Tie.xs"
+my_sourcefiles="`find_source`"
my_typemapdir="../Apache"
# find APXS
1.1 modperl/apaci/find_source.PL
Index: find_source.PL
===================================================================
chdir ".." unless -e 'MANIFEST';
local(*MANI);
open MANI, "MANIFEST" or die "open MANIFEST $!";
while(<MANI>) {
next unless s,^src/modules/perl/,,; chomp;
next unless m,.+\.(xs|c|h)$,;
print "$_ ";
}
close MANI;