perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/lib/Apache src.pm
Date Thu, 01 Oct 1998 18:29:00 GMT
dougm       98/10/01 11:28:59

  Modified:    .        MANIFEST Changes Makefile.PL
               lib/Apache src.pm
  Log:
  added INSTALL.simple.mod_ssl and SSL_BASE=... Makefile.PL option
  
  Revision  Changes    Path
  1.45      +1 -0      modperl/MANIFEST
  
  Index: MANIFEST
  ===================================================================
  RCS file: /export/home/cvs/modperl/MANIFEST,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- MANIFEST	1998/10/01 03:21:44	1.44
  +++ MANIFEST	1998/10/01 18:28:55	1.45
  @@ -215,6 +215,7 @@
   INSTALL.simple
   INSTALL.simple.ssl
   INSTALL.simple.stronghold
  +INSTALL.simple.mod_ssl
   t/docs/subr/.exists
   PerlRunXS/Makefile.PL
   PerlRunXS/PerlRunXS.pm
  
  
  
  1.167     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- Changes	1998/10/01 18:25:28	1.166
  +++ Changes	1998/10/01 18:28:55	1.167
  @@ -8,6 +8,8 @@
   
   =item 1.15_02-dev
   
  +added INSTALL.simple.mod_ssl and SSL_BASE=... Makefile.PL option
  +
   Apache::PerlRun::handler changes:
   
    - PerlRunOnce option
  
  
  
  1.102     +11 -3     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Makefile.PL	1998/09/26 18:41:51	1.101
  +++ Makefile.PL	1998/10/01 18:28:56	1.102
  @@ -150,6 +150,7 @@
   $PERL_STATIC_EXTS = "";
   $PERL_EXTRA_CFLAGS = "";
   $SSLCacheServerPort = 8539;
  +$SSL_BASE = ""; 
   $Port = 8529;
   #so Doug can 'make test' different-builds@sametime/samebox
   if(!$Is_Win32 and $Is_dougm and $$ > 8000 and $$ < 30000) {
  @@ -200,10 +201,12 @@
   PERL_ORALL_OPMASK
   };
   
  -my @mp_args = 
  +my %PassEnv = map { $_,1 } qw(SSL_BASE);
  +
  +my @mp_args = (keys %PassEnv,
       qw(EXPERIMENTAL 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 XS_IMPORT);
  +       ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT XS_IMPORT));
   
   sub is_mp_arg {
       my $arg = shift; 
  @@ -302,6 +305,10 @@
       $PERL_EXTRA_CFLAGS .= " -DPERL_SAFE_STARTUP=1";
   }
   
  +for (keys %PassEnv) {
  +    $ENV{$_} = $$_ if $$_;
  +}
  +
   $USE_APACI = 1 if $USE_DSO;
   if($USE_DSO or $USE_APXS and !$DO_HTTPD) {
       print "*" x 65, $/;
  @@ -1762,7 +1769,8 @@
   package Apache::MyConfig ;
   
   %Setup = (
  -   'Apache_Src' => \'$APACHE_SRC\'
  +   'Apache_Src' => \'$APACHE_SRC\',
  +   'SSL_BASE' => \'$SSL_BASE\',
   );
   
   1;
  
  
  
  1.10      +4 -0      modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /export/home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- src.pm	1998/09/23 20:50:43	1.9
  +++ src.pm	1998/10/01 18:28:58	1.10
  @@ -189,6 +189,10 @@
   	push @inc, "-I$_" if -d $_;
       }
       my $ssl_dir = "$src/../ssl/include";
  +    unless (-d $ssl_dir) {
  +	eval { require Apache::MyConfig };
  +	$ssl_dir = "$Apache::MyConfig::Setup{SSL_BASE}/include";
  +    }
       push @inc, "-I$ssl_dir" if -d $ssl_dir;
       return "@inc";
   }
  
  
  

Mime
View raw message