cvs commit: modperl/apaci configure mod_perl.config.sh

[do...@hyperreal.org]

dougm       98/06/07 18:40:16

  Modified:    .        Makefile.PL
               apaci    configure mod_perl.config.sh
  Log:
  a few USE_APXS tweaks:
  have configure `cp -f' so source files can be overwritten
  'make clean' will (cd ./apaci && make clean)
  replace -Wl args meant for gcc with args for ld if $^O eq "hpux"
  
  Revision  Changes    Path
  1.39      +8 -4      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Makefile.PL	1998/06/08 01:01:27	1.38
  +++ Makefile.PL	1998/06/08 01:40:15	1.39
  @@ -921,10 +921,14 @@
   sub MY::clean {
       my $self = shift;
       my $string = $self->MM::clean;
  -    return $string if $NO_HTTPD;
  -    my $asrc = asrc($APACHE_SRC, "http_main.c");
  -    return $string unless $APACHE_SRC and -e "$asrc/http_main.c";
  -    $string .= "\t-cd \$(APACHE_SRC) && \$(MAKE) clean\n";
  +    unless($NO_HTTPD) {
  +	my $asrc = asrc($APACHE_SRC, "http_main.c");
  +	return $string unless $APACHE_SRC and -e "$asrc/http_main.c";
  +	$string .= "\t-cd \$(APACHE_SRC) && \$(MAKE) clean\n";
  +    }
  +    if($USE_APXS) {
  +	$string .= "\t-cd ./apaci && \$(MAKE) clean\n";
  +    }
       $string;
   }
   
  
  
  
  1.3       +2 -2      modperl/apaci/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/modperl/apaci/configure,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- configure	1998/05/28 10:38:49	1.2
  +++ configure	1998/06/08 01:40:16	1.3
  @@ -76,9 +76,9 @@
   #   fetch the source files
   echo "$my_prefix Creating a local mod_perl source tree"
   for my_file in $my_sourcefiles; do
  -    cp $my_sourcedir/$my_file .
  +    cp -f $my_sourcedir/$my_file .
   done
  -cp $my_typemapdir/typemap .
  +cp -f $my_typemapdir/typemap .
   
   #   begin generation of Makefile
   echo "##" >$my_makefileconf
  
  
  
  1.5       +8 -0      modperl/apaci/mod_perl.config.sh
  
  Index: mod_perl.config.sh
  ===================================================================
  RCS file: /export/home/cvs/modperl/apaci/mod_perl.config.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_perl.config.sh	1998/06/04 15:16:08	1.4
  +++ mod_perl.config.sh	1998/06/08 01:40:16	1.5
  @@ -111,6 +111,14 @@
   use Config;
   my $ldopts = `$^X -MExtUtils::Embed -e ldopts -- -std @ARGV`;
   $ldopts =~ s,(-bE:)(perl\.exp),$1$Config{archlibexp}/CORE/$2, if($^O eq "aix");
  +#replace -Wl args meant for gcc with args for ld
  +if($^O eq "hpux") {
  +    while ($ldopts =~ s/-Wl,(\S+)/$1/) {
  +	my $cp = $1;
  +	(my $repl = $cp) =~ s/,/ /g;
  +	$ldopts =~ s/$cp/$repl/;
  +    }
  +}
   print $ldopts;
   EOT
   perl_libs="`$perl_interp $tmpfile2`"