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...@locus.apache.org on 2000/05/13 00:48:09 UTC

cvs commit: modperl Changes Makefile.PL

dougm       00/05/12 15:48:09

  Modified:    .        Changes Makefile.PL
  Log:
  Makefile.PL warns about 5.6.0+uselargefiles if USE_APXS
  
  Revision  Changes    Path
  1.481     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.480
  retrieving revision 1.481
  diff -u -r1.480 -r1.481
  --- Changes	2000/05/12 22:45:30	1.480
  +++ Changes	2000/05/12 22:48:06	1.481
  @@ -10,6 +10,8 @@
   
   =item 1.23_01-dev
   
  +Makefile.PL warns about 5.6.0+uselargefiles if USE_APXS
  +
   Apache::Table->unset can now be called with an array reference
   
   Apache::PerlRun::flush_namespace fixes, so aliased (imported)
  
  
  
  1.161     +22 -5     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.160
  retrieving revision 1.161
  diff -u -r1.160 -r1.161
  --- Makefile.PL	2000/04/27 22:45:30	1.160
  +++ Makefile.PL	2000/05/12 22:48:07	1.161
  @@ -1,4 +1,5 @@
  -#! /usr/local/bin/perl
  +#!perl
  +
   BEGIN { 
       $Is_Win32 = ($^O eq "MSWin32");
       $Is_Cygwin = ($^O =~ m/cygwin/g);
  @@ -361,10 +362,8 @@
           exit;
       }
   }
  -
  -system_sanity_check();
   
  -if($USE_APXS) {
  +if ($USE_APXS) {
       if(-e $USE_APXS and !(-d _)) {
           $WITH_APXS = $USE_APXS;
       }
  @@ -382,7 +381,10 @@
       print "\n";
       ++$NO_HTTPD;
   }
  -elsif($USE_APACI) {
  +
  +system_sanity_check();
  +
  +if ($USE_APACI) {
       print "Will configure via APACI";
       gen_script("apaci/load_modules.pl");
       if($USE_DSO) {
  @@ -2041,6 +2043,7 @@
   
       gdbm_check();
       malloc_check();
  +    uselargefiles_check();
       dynaloader_check();
   
   }
  @@ -2071,6 +2074,20 @@
   EOF
          }
       }
  +}
  +
  +sub uselargefiles_check {
  +    return unless $] >= 5.006 and $Config{uselargefiles} and $USE_APXS;
  +    local $Apache::src::APXS = $WITH_APXS;
  +    my $cflags = Apache::src->new->apxs('-q' => 'CFLAGS') || '';
  +    return if $cflags =~ /LARGEFILE/;
  +
  +    phat_warn(<<EOF);
  +Your Perl is uselargefiles enabled, but Apache is not, suggestions:
  +    *) Rebuild Apache with CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  +    *) Rebuild Perl with Configure -Uuselargefiles
  +    *) Let mod_perl build Apache (USE_DSO=1 instead of USE_APXS=1)
  +EOF
   }
   
   sub malloc_check {