dougm       00/05/25 11:06:27

  Modified:    .        Changes Makefile.PL
               src/modules/perl mod_perl.c
  Log:
  fixes for building with stronghold
  
  Revision  Changes    Path
  1.492     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.491
  retrieving revision 1.492
  diff -u -r1.491 -r1.492
  --- Changes   2000/05/23 18:45:07     1.491
  +++ Changes   2000/05/25 18:06:10     1.492
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +fixes for building with stronghold
  +[Sander van Zoest <[EMAIL PROTECTED]>]
  +
   Apache::Resource was not converting PERL_RLIMIT_AS to MB values
   thanks to Ian Kallen for the spot
   
  
  
  
  1.163     +7 -2      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.162
  retrieving revision 1.163
  diff -u -r1.162 -r1.163
  --- Makefile.PL       2000/05/16 21:53:14     1.162
  +++ Makefile.PL       2000/05/25 18:06:13     1.163
  @@ -947,8 +947,13 @@
        }
   
        $cmd .= "./configure " .
  -               "--activate-module=src/modules/perl/libperl.a" .
  -                    " --disable-rule=EXPAT";
  +               "--activate-module=src/modules/perl/libperl.a";
  +   
  +        # Do not disable the rule EXPAT for Stronghold, since this
  +        # rule is not implementated yet and breaks the configure process.
  +        if(is_ssl() !~ /stronghold/i) {
  +           $cmd .= " --disable-rule=EXPAT";
  +        }
   
        if($USE_DSO) {
            $cmd .= " --enable-shared=perl";
  
  
  
  1.121     +1 -1      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- mod_perl.c        2000/05/18 18:05:38     1.120
  +++ mod_perl.c        2000/05/25 18:06:23     1.121
  @@ -735,7 +735,7 @@
       perl_tainting_set(s, cls->PerlTaintCheck);
       (void)GvSV_init("Apache::__SendHeader");
       (void)GvSV_init("Apache::__CurrentCallback");
  -#ifndef WIN32
  +#if !defined(WIN32) && !defined(STRONGHOLD)
       if (ap_configtestonly)
        GvSV_setiv(GvSV_init("Apache::Server::ConfigTestOnly"), TRUE);
   #endif
  
  
  

Reply via email to