Mailing List Archive

rse 98/06/09 06:55:03

Modified: . Makefile.PL
Log:
Fix three APACI/APXS-related things:

1. The shell doesn't like strings like "can't". We need quotes here.

2. MakeMaker complained that WITH_APXS is not a MakeMaker argument

3. The C compiler for the APXS is already the correct one (no forcing
via "make CC=.." needed) while under APACI it has to be set at the
configuration step and cannot be overridden later (notice that mod_perl
_always_ use the $Config{cc}, CC=.. only affects the rest of Apache).

Now all three new build variants seem to work fine.

Revision Changes Path
1.42 +8 -5 modperl/Makefile.PL

Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.PL 1998/06/08 21:30:09 1.41
+++ Makefile.PL 1998/06/09 13:55:02 1.42
@@ -150,7 +150,7 @@

my @mp_args =
qw(EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE
- USE_APACI USE_DSO USE_APXS APACI_ARGS
+ USE_APACI USE_DSO USE_APXS WITH_APXS APACI_ARGS
ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT);

sub is_mp_arg {
@@ -720,13 +720,16 @@
}

if($USE_APACI) {
- my $cmd = "./configure --activate-module=src/modules/perl/libperl.a";
+ my $cmd = "CC=\"$Config{cc}\" " .
+ "./configure " .
+ "--activate-module=src/modules/perl/libperl.a";
if($USE_DSO) {
$cmd .= " --enable-shared=perl";
}
if($APACI_ARGS) {
$cmd .= " " . join " ", split(',', $APACI_ARGS);
}
+ print "(cd $APACHE_ROOT && $cmd)\n";
system "(cd $APACHE_ROOT && $cmd)";
}
#expand ./t to full path
@@ -965,7 +968,7 @@
$string .= <<'EOF';

apxs_libperl:
- (cd ./apaci && $(MAKE) CC="$(CC)";)
+ (cd ./apaci && $(MAKE))

apxs_install: apxs_libperl
(cd ./apaci && $(MAKE) install;)
@@ -974,7 +977,7 @@
(cd $(APACHE_SRC) && $(MAKE) CC="$(CC)";)

apaci_httpd:
- (cd $(APACHE_ROOT) && $(MAKE) CC="$(CC)";)
+ (cd $(APACHE_ROOT) && $(MAKE))

tar_Apache:
(cd $(INSTALLSITELIB); \
@@ -1011,7 +1014,7 @@
my $test = $self->MM::test;
return <<'EOF' if $USE_APXS;
test:
- @echo can't make test with apxs (yet)
+ @echo "Can't make test with APXS (yet)"
EOF

my $script = "t/TEST";