cvs commit: modperl Changes Makefile.PL STATUS

2002-05-22 Thread dougm 

dougm   02/05/22 20:38:39

  Modified:.Changes Makefile.PL STATUS
  Log:
  Submitted by: Randy Kobes <[EMAIL PROTECTED]>
  Reviewed by:  dougm
  fix Win32 build problems with spaces in shell arguments
  
  Revision  ChangesPath
  1.644 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.643
  retrieving revision 1.644
  diff -u -r1.643 -r1.644
  --- Changes   23 May 2002 03:07:27 -  1.643
  +++ Changes   23 May 2002 03:38:39 -  1.644
  @@ -10,6 +10,9 @@
   
   =item 1.26_01-dev
   
  +fix Win32 build problems with spaces in shell arguments
  +[Randy Kobes <[EMAIL PROTECTED]>]
  +
   make sure DynaLoader is loaded before XSLoader to workaround possible
   segv when using mod_perl as a dso with perl 5.6.1
   
  
  
  
  1.202 +1 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.201
  retrieving revision 1.202
  diff -u -r1.201 -r1.202
  --- Makefile.PL   23 May 2002 02:52:15 -  1.201
  +++ Makefile.PL   23 May 2002 03:38:39 -  1.202
  @@ -1104,7 +1104,7 @@
   cp "lib/mod_perl_hooks.pm.PL", "lib/mod_perl_hooks.pm"; 
   
   if ($Is_Win32) {
  -  my @args = ($^X, '-spi.bak ', ' -e ', "\"s/sub mod_perl::hooks.*/sub 
mod_perl::hooks { qw($hooks) }/\"", 'lib/mod_perl_hooks.pm');
  +  my @args = ($^X, '-spi.bak', '-e', "\"s/sub mod_perl::hooks.*/sub 
mod_perl::hooks { qw($hooks) }/\"", 'lib/mod_perl_hooks.pm');
 system(@args) == 0 or die "@args failed\n";
   }
   iedit "lib/mod_perl_hooks.pm", 
  
  
  
  1.19  +1 -7  modperl/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/modperl/STATUS,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- STATUS14 May 2002 18:05:34 -  1.18
  +++ STATUS23 May 2002 03:38:39 -  1.19
  @@ -1,5 +1,5 @@
   mod_perl 1.3 STATUS:
  -   Last modified at [$Date: 2002/05/14 18:05:34 $]
  +   Last modified at [$Date: 2002/05/23 03:38:39 $]
   
   
   Release:
  @@ -9,12 +9,6 @@
  
   
   Available Patches:
  -
  -* Win32 build problems with spaces in shell arguments
  -Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=101681938513575&w=2
  - Status: 
  -  patch available at
  -  http://marc.theaimsgroup.com/?l=apache-modperl&m=101729204503165&w=2
   
   * implement notes('error-notes') in Registry a la mod_cgo
   Report: http://marc.theaimsgroup.com/?l=apache-modperl&m=101862462900504&w=2

cvs commit: modperl Changes Makefile.PL

2002-05-22 Thread dougm 

dougm   02/05/22 19:52:15

  Modified:.Changes Makefile.PL
  Log:
  autoset PERL_USELARGEFILES=0 if needed
  
  Revision  ChangesPath
  1.642 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.641
  retrieving revision 1.642
  diff -u -r1.641 -r1.642
  --- Changes   16 Apr 2002 02:43:55 -  1.641
  +++ Changes   23 May 2002 02:52:15 -  1.642
  @@ -10,6 +10,8 @@
   
   =item 1.26_01-dev
   
  +autoset PERL_USELARGEFILES=0 if needed
  +
   fix taint issues with bleedperl
   
   fix bug in modules/util test
  
  
  
  1.201 +10 -7 modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.200
  retrieving revision 1.201
  diff -u -r1.200 -r1.201
  --- Makefile.PL   23 May 2002 02:44:40 -  1.200
  +++ Makefile.PL   23 May 2002 02:52:15 -  1.201
  @@ -382,13 +382,6 @@
   $PERL_EXTRA_CFLAGS .= " -DPERL_SAFE_STARTUP=1";
   }
   
  -if ($PERL_USELARGEFILES and $] >= 5.006) {
  -$PERL_EXTRA_CFLAGS .= " $Config{ccflags}";
  -}
  -
  -# apache-1.3.xx won't compile with -D_GNU_SOURCE
  -$PERL_EXTRA_CFLAGS =~ s/-D_GNU_SOURCE//;
  -
   for (keys %PassEnv) {
   $ENV{$_} = $$_ if $$_;
   }
  @@ -430,6 +423,13 @@
   
   system_sanity_check();
   
  +if ($PERL_USELARGEFILES and $] >= 5.006) {
  +$PERL_EXTRA_CFLAGS .= " $Config{ccflags}";
  +}
  +
  +# apache-1.3.xx won't compile with -D_GNU_SOURCE
  +$PERL_EXTRA_CFLAGS =~ s/-D_GNU_SOURCE//;
  +
   if ($USE_APACI) {
   print "Will configure via APACI";
   if($USE_DSO) {
  @@ -2459,6 +2459,9 @@
   local $Apache::src::APXS = $WITH_APXS;
   my $cflags = Apache::src->new->apxs('-q' => 'CFLAGS') || '';
   return if $cflags =~ /LARGEFILE/;
  +
  +$PERL_USELARGEFILES=0; #just do it since
  +return; #nobody seems to listen to the warning below
   
   phat_warn(<

cvs commit: modperl Changes Makefile.PL

2002-03-22 Thread stas 

stas02/03/22 11:58:13

  Modified:.Changes Makefile.PL
  Log:
  the first flag argument to perl cannot start with space, since perl tries
  to open the " -spi.bak" as a file. fix that in the win32 case.
  
  Revision  ChangesPath
  1.626 +4 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.625
  retrieving revision 1.626
  diff -u -r1.625 -r1.626
  --- Changes   19 Mar 2002 02:18:02 -  1.625
  +++ Changes   22 Mar 2002 19:58:13 -  1.626
  @@ -10,6 +10,10 @@
   
   =item 1.26_01-dev
   
  +the first flag argument to perl cannot start with space, since perl tries 
  +to open the " -spi.bak" as a file. fix that in the win32 case.
  +[Stas Bekman <[EMAIL PROTECTED]>]
  +
   starting from perl 5.7.3 for tied filehandles, tiedscalar magic is applied 
   to the IO slot of the GP rather than the GV itself. adjust the TIEHANDLE 
   macro to work properly under 5.7.3+. [Charles Jardine <[EMAIL PROTECTED]>, 
  
  
  
  1.197 +1 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- Makefile.PL   9 Sep 2001 21:56:46 -   1.196
  +++ Makefile.PL   22 Mar 2002 19:58:13 -  1.197
  @@ -1101,7 +1101,7 @@
   cp "lib/mod_perl_hooks.pm.PL", "lib/mod_perl_hooks.pm"; 
   
   if ($Is_Win32) {
  -  my @args = ($^X, ' -spi.bak ', ' -e ', "\"s/sub mod_perl::hooks.*/sub 
mod_perl::hooks { qw($hooks) }/\"", 'lib/mod_perl_hooks.pm');
  +  my @args = ($^X, '-spi.bak ', ' -e ', "\"s/sub mod_perl::hooks.*/sub 
mod_perl::hooks { qw($hooks) }/\"", 'lib/mod_perl_hooks.pm');
 system(@args) == 0 or die "@args failed\n";
   }
   iedit "lib/mod_perl_hooks.pm",

cvs commit: modperl Changes Makefile.PL

2001-09-09 Thread dougm 

dougm   01/09/09 14:56:46

  Modified:.Changes Makefile.PL
  Log:
  warn if Perl is configured with -Duseshrplib and a libperl.so is found
  in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
  
  Revision  ChangesPath
  1.622 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.621
  retrieving revision 1.622
  diff -u -r1.621 -r1.622
  --- Changes   2001/09/09 18:48:47 1.621
  +++ Changes   2001/09/09 21:56:46 1.622
  @@ -10,6 +10,9 @@
   
   =item 1.26_01-dev
   
  +warn if Perl is configured with -Duseshrplib and a libperl.so is found
  +in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
  +
   fix potential segv in Apache::URI->rpath
   [Vyacheslav Zamyatin <[EMAIL PROTECTED]>]
   
  
  
  
  1.196 +29 -0 modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.195
  retrieving revision 1.196
  diff -u -r1.195 -r1.196
  --- Makefile.PL   2001/07/17 15:54:05 1.195
  +++ Makefile.PL   2001/09/09 21:56:46 1.196
  @@ -2410,6 +2410,7 @@
   malloc_check();
   uselargefiles_check();
   dynaloader_check();
  +shrplib_check();
   
   if ($USE_APXS and $Config{libs} =~ /($thrlib)/) {
   my $lib = $1;
  @@ -2560,4 +2561,32 @@
/* Added by Wayne Scott 
   
   EOF
  +}
  +
  +sub shrplib_check {
  +return unless $Config{'useshrplib'} and
  +  $Config{'useshrplib'} eq 'define';
  +
  +my $libperl = $Config{'libperl'} || 'libperl.so';
  +
  +for my $dir (qw(/lib /usr/lib /usr/local/lib)) {
  +next unless -e "$dir/$libperl";
  +
  +my $coredir = "$Config{'archlibexp'}/CORE";
  +my $corelib = "$coredir/$libperl";
  +
  +phat_warn(<

cvs commit: modperl Changes Makefile.PL

2001-05-01 Thread dougm 

dougm   01/05/01 10:08:25

  Modified:.Changes Makefile.PL
  Log:
  fix 'make offsite-tar'
  
  Revision  ChangesPath
  1.590 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.589
  retrieving revision 1.590
  diff -u -r1.589 -r1.590
  --- Changes   2001/04/27 17:01:53 1.589
  +++ Changes   2001/05/01 17:08:25 1.590
  @@ -10,6 +10,8 @@
   
   =item 1.25_01-dev
   
  +fix 'make offsite-tar' [Geoffrey Young <[EMAIL PROTECTED]>]
  +
   win32 fixes [Randy Kobes <[EMAIL PROTECTED]>]
   
   fix double-loading bug of Perl{Require,Module}s at startup time
  
  
  
  1.184 +7 -3  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.183
  retrieving revision 1.184
  diff -u -r1.183 -r1.184
  --- Makefile.PL   2001/04/27 17:01:53 1.183
  +++ Makefile.PL   2001/05/01 17:08:25 1.184
  @@ -1390,13 +1390,17 @@
   
   offsite-tar:
$(CP) MANIFEST MANIFEST.orig
  - $(PERL) -e 'for (<$(APACHE_SRC)/*.h>) {' \
  - -e 'system "$(CP) $$_ src/";' \
  + echo src/Makefile.config >> MANIFEST
  + $(CP) $(APACHE_SRC)/Makefile.config src/Makefile.config
  + mkdir "src/include"
  + $(PERL) -e 'for (<$(APACHE_SRC)/include/*.h>) {' \
  + -e 'system "$(CP) $$_ src/include/";' \
-e 's,^$(APACHE_SRC),,;' \
-e 'system "echo src$$_ >> MANIFEST";' \
-e '}' 
$(MAKE) dist
  - $(RM_F) src/*.h
  + $(RM_RF) src/include/
  + $(RM) src/Makefile.config
$(MV) MANIFEST.orig MANIFEST
   
   EOF

cvs commit: modperl Changes Makefile.PL

2001-04-17 Thread dougm 

dougm   01/04/17 15:39:09

  Modified:.Changes Makefile.PL
  Log:
  improve Apache::MyConfig
  
  Revision  ChangesPath
  1.587 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.586
  retrieving revision 1.587
  diff -u -r1.586 -r1.587
  --- Changes   2001/04/17 22:01:13 1.586
  +++ Changes   2001/04/17 22:39:06 1.587
  @@ -10,6 +10,8 @@
   
   =item 1.25_01-dev
   
  +improve Apache::MyConfig [Stas Bekman <[EMAIL PROTECTED]>]
  +
   back out 'stop win32 crash when bringing down service' change, no
   longer needed with 1.3.19
   [John Sterling, Will Rowe]
  
  
  
  1.180 +18 -15modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.179
  retrieving revision 1.180
  diff -u -r1.179 -r1.180
  --- Makefile.PL   2001/04/17 21:38:52 1.179
  +++ Makefile.PL   2001/04/17 22:39:07 1.180
  @@ -95,6 +95,7 @@
   $Apache::MyConfig::Setup{Apache_Src} ; 
   
   my $PWD = cwd;
  +$ENV{APACHE_CWD} = $PWD;
   $ENV{PERL5LIB} = "$PWD/lib";
   
   my %SSL = (
  @@ -1977,9 +1978,23 @@
   EOS
   }
   
  -local *FH;
  -# writing Configuration to Apache::MyConfig
  +# preparing and writing Configuration to Apache::MyConfig
  +my %my_config = %callback_hooks;
  +my @other_hooks = qw(APACHE_SRC SSL_BASE APXS PERL_USELARGEFILES
  + PERL_TRACE PERL_DEBUG APACI_ARGS APACHE_PREFIX
  + DO_HTTPD NO_HTTPD PREP_HTTPD USE_APACI
  + APACHE_HEADER_INSTALL PERL_STATIC_EXTS );
  +{
  +no strict 'refs';
  +$my_config{$_} = ${$_} for @other_hooks;
  +}
   
  +my $my_config_dump = join ",\n",
  +map { qq{'$_' => } .
  +  ($my_config{$_} =~ /^\d+$/ ? $my_config{$_} : qq{'$my_config{$_}'})
  +} sort keys %my_config;
  +
  +local *FH;
   open FH, '>lib/Apache/MyConfig.pm'  ||
die "Can't open lib/Apache/MyConfig.pm: $!";
   print FH < \'$APACHE_SRC\',
  -   'SSL_BASE' => \'$SSL_BASE\',
  -   'APXS' => \'$WITH_APXS\',
  -   'PERL_USELARGEFILES' => \'$PERL_USELARGEFILES\',
  -EOT
  -
  -  foreach my $key (sort @callback_hooks) {
  -print FH "   \'$key\' => \'$callback_hooks{$key}\',\n";
  -  }
  -
  -  print FH <

cvs commit: modperl Changes Makefile.PL

2000-12-20 Thread dougm 

dougm   00/12/20 10:35:35

  Modified:.Changes Makefile.PL
  Log:
  include mod_perl hook/feature config in Apache::MyConfig
  
  Revision  ChangesPath
  1.557 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.556
  retrieving revision 1.557
  diff -u -r1.556 -r1.557
  --- Changes   2000/12/20 08:07:32 1.556
  +++ Changes   2000/12/20 18:35:32 1.557
  @@ -10,6 +10,9 @@
   
   =item 1.24_02-dev
   
  +include mod_perl hook/feature config in Apache::MyConfig
  +[Geoffrey Young <[EMAIL PROTECTED]>]
  +
   rewrite of Apache::WRITE() in c/xs
   [Soheil Seyfaie <[EMAIL PROTECTED]>]
   
  
  
  
  1.172 +8 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- Makefile.PL   2000/12/20 06:47:45 1.171
  +++ Makefile.PL   2000/12/20 18:35:33 1.172
  @@ -1955,12 +1955,19 @@
   #
   # Configuration for mod_perl and Apache::...
   #
  -package Apache::MyConfig ;
  +package Apache::MyConfig;
   
   %Setup = (
  'Apache_Src' => \'$APACHE_SRC\',
  'SSL_BASE' => \'$SSL_BASE\',
  'APXS' => \'$WITH_APXS\',
  +EOT
  +
  +  foreach my $key (sort @callback_hooks) {
  +print FH "   \'$key\' => \'$callback_hooks{$key}\',\n";
  +  }
  +
  +  print FH <

cvs commit: modperl Changes Makefile.PL

2000-12-19 Thread dougm 

dougm   00/12/19 22:47:46

  Modified:.Changes Makefile.PL
  Log:
  allow Makefile.PL to build mod_perl on Win32 using VC++
  
  Revision  ChangesPath
  1.552 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.551
  retrieving revision 1.552
  diff -u -r1.551 -r1.552
  --- Changes   2000/12/20 06:39:47 1.551
  +++ Changes   2000/12/20 06:47:45 1.552
  @@ -10,6 +10,9 @@
   
   =item 1.24_02-dev
   
  +allow Makefile.PL to build mod_perl on Win32 using VC++
  +[Randy Kobes <[EMAIL PROTECTED]>]
  +
   stop win32 crash when bringing down service
   [John K. Sterling <[EMAIL PROTECTED]>]
   
  
  
  
  1.171 +180 -3modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- Makefile.PL   2000/10/03 14:17:22 1.170
  +++ Makefile.PL   2000/12/20 06:47:45 1.171
  @@ -313,8 +313,21 @@
   }
   }
   
  +my $vcpp = ($Config{cc} =~ /^cl(\.exe)?$/);
  +my %win32_args;
  +my %win32_accept = map {$_ => 1} qw(APACHE_SRC INSTALL_DLL DEBUG EAPI);
  +
   while($_ = shift) {
   ($k,$v) = split /=/, $_, 2;
  +if ($vcpp) {
  +  if ($win32_accept{$k}) {
  + $win32_args{$k} = ($k eq 'DEBUG' or $k eq 'EAPI') ? 1 : $v;
  +  }
  +  else {
  + push @mm_args, $_;
  +  }
  +  next;
  +}
   unless (/^(PERL|APACHE)/ or is_mp_arg($k)) {
push @mm_args, $_;
   }
  @@ -327,6 +340,8 @@
   $callback_hooks{$k} = $v if exists $callback_hooks{$k};
   }
   
  +my $win32_auto = ($vcpp and $win32_args{APACHE_SRC}) ? 1 : 0;
  +
   my %very_experimental = map {$_,1} 
   qw(PERL_DEFAULT_OPMASK PERL_SAFE_STARTUP PERL_ORALL_OPMASK 
  PERL_STARTUP_DONE_CHECK PERL_DSO_UNLOAD);
  @@ -867,6 +882,13 @@
   
   init_config_pl() if $Is_Win32;
   
  +my (%win32_path);
  +if ($win32_auto) {
  +  use File::Spec;
  +  win32_inc_and_lib();
  +  win32_fix_dsp();
  +}
  +
   write_my_config($APACHE_SRC);
   
   unless($Is_Win32 or -e "t/conf/httpd.conf" or ($NO_HTTPD && !$PREP_HTTPD)) {
  @@ -1227,6 +1249,13 @@
   sub MY::clean {
   my $self = shift;
   my $string = $self->MM::clean(@_);
  +if ($win32_auto) {
  +  $string .= sprintf 
  + qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
  +   qq{\t/MAKE "ApacheModulePerl - Win32 %s" /CLEAN\n}, 
  +   ($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
  +  return $string;
  +}
   unless($NO_HTTPD) {
my $asrc = asrc($APACHE_SRC, "http_main.c");
return $string unless $APACHE_SRC and -e "$asrc/http_main.c";
  @@ -1245,12 +1274,15 @@
   if($USE_APXS) {
$add = "apxs_install";
   }
  +elsif ($win32_auto and $win32_args{INSTALL_DLL}) {
  +  $add = 'amp_install';
  +}
   elsif($USE_APACI) {
if($APACI_ARGS =~ /--prefix=/ or $APACHE_PREFIX) {
$add = "apaci_install";
}
   }
  -if($add and (!$NO_HTTPD and !$PREP_HTTPD) or $USE_APXS) {
  +if($add and (!$NO_HTTPD and !$PREP_HTTPD) or $USE_APXS or $win32_auto) {
$string =~ s/(pure_install\s+)(.*)/$1 $add $2/;
   }
   return $string;
  @@ -1259,7 +1291,20 @@
   sub MY::top_targets {
   my $self = shift;
   my $string = $self->MM::top_targets;
  -return $string unless $USE_APXS or $USE_APACI or $APACHE_SRC;
  +return $string unless $USE_APXS or $USE_APACI or $APACHE_SRC or $win32_auto;
  +
  +if ($win32_auto) {
  +  $string =~ s/(pure_all\s+::.*\s+subdirs\s+)(.*)/$1 amp_dll $2/;
  +  $string .= sprintf qq{\namp_dll:\n} . 
  + qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
  +   qq{\t/MAKE "ApacheModulePerl - Win32 %s" /USEENV\n}, 
  +   ($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
  +  if ($win32_args{INSTALL_DLL}) {
  + $string .= sprintf qq{\namp_install:\n\t\$(CP) "%s" "%s"}, 
  + "$win32_path{MODPERL_LIB}/ApacheModulePerl.dll", $win32_args{INSTALL_DLL};
  +  }
  +  return $string;
  +}
   
   if($USE_APXS) {
$string =~ s/(pure_all\s+::\s+)(.*)/$1 apxs_libperl $2/;
  @@ -1890,6 +1935,17 @@
   
   sub write_my_config {
   my $src = shift;
  +
  +my $string;
  +if ($win32_auto) {
  +  $string =<<"EOS";
  +'APACHE_INC' => '$win32_path{APACHE_INC}',
  +   'APACHE_LIB' => '$win32_path{APACHE_LIB}',
  +   'MODPERL_INC' => '$win32_path{MODPERL_INC}',
  +   'MODPERL_LIB' => '$win32_path{MODPERL_LIB}',
  +EOS
  +}
  +
   local *FH;
   # writing Configuration to Apache::MyConfig
   
  @@ -1897,7 +1953,7 @@
die "Can't open lib/Apache/MyConfig.pm: $!";
   print FH < \'$APACHE_SRC\',
  'SSL_BASE' => \'$SSL_BASE\',
  'APXS' => \'$WITH_APXS\',
  +   $s

cvs commit: modperl Changes Makefile.PL

2000-09-27 Thread dougm 

dougm   00/09/27 10:55:24

  Modified:.Changes Makefile.PL
  Log:
  fix for Makefile.PL ADD_MODULE=src/module/foo/libfoo.a
  
  Revision  ChangesPath
  1.528 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.527
  retrieving revision 1.528
  diff -u -r1.527 -r1.528
  --- Changes   2000/09/27 16:25:48 1.527
  +++ Changes   2000/09/27 17:55:21 1.528
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +fix for Makefile.PL ADD_MODULE=src/module/foo/libfoo.a
  +[Nelson Oliveira <[EMAIL PROTECTED]>]
  +
   added Apache::user method in preparation for 2.0, now that `user' hangs
   off of the request_rec rather than request_rec->connection in Apache 2.0
   
  
  
  
  1.169 +2 -2  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- Makefile.PL   2000/09/26 21:19:33 1.168
  +++ Makefile.PL   2000/09/27 17:55:21 1.169
  @@ -975,10 +975,10 @@
} 
if($ADD_MODULE) {
for (split ",", $ADD_MODULE) {
  - if(/([a-zA-Z0-9][a-zA-Z0-9_]*)/) {
  + if(/^([a-zA-Z0-9][a-zA-Z0-9_]+)$/) {
$cmd .= " --enable-module=$1";
}
  - elsif(m:(src/modules/[^/]+/[a-zA-Z0-9][a-zA-Z0-9_]*):) {
  + elsif(m:(src/modules/[^/]+/[^/]+)$:) {
$cmd .= " --activate-module=$1";
}
}

cvs commit: modperl Changes Makefile.PL

2000-09-26 Thread dougm 

dougm   00/09/26 14:19:38

  Modified:.Changes Makefile.PL
  Log:
  fix 'make tar_Apache'
  
  Revision  ChangesPath
  1.525 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.524
  retrieving revision 1.525
  diff -u -r1.524 -r1.525
  --- Changes   2000/09/26 21:02:36 1.524
  +++ Changes   2000/09/26 21:19:32 1.525
  @@ -10,6 +10,8 @@
   
   =item 1.24_01-dev
   
  +fix 'make tar_Apache' [Jesse Erlbaum <[EMAIL PROTECTED]>]
  +
   fix for Perl{Module,Require} in .htaccess,
   thanks to Will Trillich and Andrew Gideon for the spot
   
  
  
  
  1.168 +1 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- Makefile.PL   2000/09/26 16:55:36 1.167
  +++ Makefile.PL   2000/09/26 21:19:33 1.168
  @@ -1303,7 +1303,7 @@
(cd $(APACHE_ROOT) && $(MAKE) install)
   
   tar_Apache:
  - (cd $(INSTALLSITELIB); \
  + (cd $(INSTALLSITELIB)/$(ARCHNAME); \
 $(TAR) -cf $(PWD)/Apache.tar mod_perl.pm Apache.pm Apache 
$(ARCHNAME)/auto/Apache; )
   
   offsite-tar:

cvs commit: modperl Changes Makefile.PL

2000-05-12 Thread dougm 

dougm   00/05/12 15:48:09

  Modified:.Changes Makefile.PL
  Log:
  Makefile.PL warns about 5.6.0+uselargefiles if USE_APXS
  
  Revision  ChangesPath
  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(<

cvs commit: modperl Changes Makefile.PL

2000-04-27 Thread dougm 

dougm   00/04/27 15:45:30

  Modified:.Changes Makefile.PL
  Log:
  pass $Config{ccflags} to apache for 5.6.0+
  
  Revision  ChangesPath
  1.476 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.475
  retrieving revision 1.476
  diff -u -r1.475 -r1.476
  --- Changes   2000/04/27 22:29:46 1.475
  +++ Changes   2000/04/27 22:45:30 1.476
  @@ -10,6 +10,8 @@
   
   =item 1.23_01-dev
   
  +pass $Config{ccflags} to apache for 5.6.0+
  +
   fix Apache->httpd_conf, thanks to Will Trillich for the spot
   
   fixed 'make clean' to remove FILES => passed to MakeMaker
  
  
  
  1.160 +1 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.159
  retrieving revision 1.160
  diff -u -r1.159 -r1.160
  --- Makefile.PL   2000/04/21 19:37:45 1.159
  +++ Makefile.PL   2000/04/27 22:45:30 1.160
  @@ -186,7 +186,7 @@
   $PERL_DEBUG = "";
   $PERL_DESTRUCT_LEVEL = "";
   $PERL_STATIC_EXTS = "";
  -$PERL_EXTRA_CFLAGS = "";
  +$PERL_EXTRA_CFLAGS = $] >= 5.006 ? $Config{ccflags} : "";
   $SSLCacheServerPort = 8539;
   $SSL_BASE = ""; 
   $Port = $ENV{HTTP_PORT} || 8529;

cvs commit: modperl Changes Makefile.PL

2000-04-21 Thread dougm 

dougm   00/04/21 12:37:46

  Modified:.Changes Makefile.PL
  Log:
  fixed 'make clean' to remove FILES => passed to MakeMaker
  
  Revision  ChangesPath
  1.474 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.473
  retrieving revision 1.474
  diff -u -r1.473 -r1.474
  --- Changes   2000/04/21 06:55:35 1.473
  +++ Changes   2000/04/21 19:37:45 1.474
  @@ -10,6 +10,8 @@
   
   =item 1.23_01-dev
   
  +fixed 'make clean' to remove FILES => passed to MakeMaker
  +
   =item 1.23 - April 20, 2000
   
   create test files during Makefile.PL so 'make test' can be run as root
  
  
  
  1.159 +1 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- Makefile.PL   2000/04/21 06:24:27 1.158
  +++ Makefile.PL   2000/04/21 19:37:45 1.159
  @@ -1202,7 +1202,7 @@
   
   sub MY::clean {
   my $self = shift;
  -my $string = $self->MM::clean;
  +my $string = $self->MM::clean(@_);
   unless($NO_HTTPD) {
my $asrc = asrc($APACHE_SRC, "http_main.c");
return $string unless $APACHE_SRC and -e "$asrc/http_main.c";

cvs commit: modperl Changes Makefile.PL

2000-04-20 Thread dougm 

dougm   00/04/20 22:56:20

  Modified:.Changes Makefile.PL
  Log:
  --disable-rule=EXPAT is passed to Apache's configure to avoid
  XML::Parser conflicts
  
  Revision  ChangesPath
  1.470 +3 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.469
  retrieving revision 1.470
  diff -u -r1.469 -r1.470
  --- Changes   2000/04/13 23:31:50 1.469
  +++ Changes   2000/04/21 05:56:19 1.470
  @@ -10,6 +10,9 @@
   
   =item 1.22_01-dev
   
  +--disable-rule=EXPAT is passed to Apache's configure to avoid
  +XML::Parser conflicts
  +
   User/Group for 'make test' can be overridden with the environment
   variables APACHE_USER/APACHE_GROUP
   
  
  
  
  1.157 +2 -1  modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.156
  retrieving revision 1.157
  diff -u -r1.156 -r1.157
  --- Makefile.PL   2000/04/13 23:31:50 1.156
  +++ Makefile.PL   2000/04/21 05:56:19 1.157
  @@ -936,7 +936,8 @@
}
   
$cmd .= "./configure " .
  -   "--activate-module=src/modules/perl/libperl.a";
  +   "--activate-module=src/modules/perl/libperl.a" .
  +" --disable-rule=EXPAT";
   
if($USE_DSO) {
$cmd .= " --enable-shared=perl";

cvs commit: modperl Changes Makefile.PL

2000-04-02 Thread dougm 

dougm   00/04/02 20:40:36

  Modified:.Changes Makefile.PL
  Log:
  warn that dso+Perl malloc needs a Perl built with -Ubincompat5005
  
  Revision  ChangesPath
  1.453 +2 -0  modperl/Changes
  
  Index: Changes
  ===
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.452
  retrieving revision 1.453
  diff -u -r1.452 -r1.453
  --- Changes   2000/04/03 03:11:14 1.452
  +++ Changes   2000/04/03 03:40:35 1.453
  @@ -10,6 +10,8 @@
   
   =item 1.22_01-dev
   
  +warn that dso+Perl malloc needs a Perl built with -Ubincompat5005
  +
   add Apache::BINMODE stub for 5.6.0 tied filehandle support (fixes cgi.t #4)
   [Randy Kobes <[EMAIL PROTECTED]>]
   
  
  
  
  1.153 +70 -44modperl/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- Makefile.PL   2000/03/30 00:21:48 1.152
  +++ Makefile.PL   2000/04/03 03:40:35 1.153
  @@ -1992,15 +1992,21 @@
   }
   
   sub phat_warn {
  -my $msg = shift;
  - warn <;
  + }
  + my $suggest = @maybe ? 
  +   "You could just symlink it to $maybe[0]" :
  + "You might need to install Perl from source";
  + phat_warn(<;
  - }
  - my $suggest = @maybe ? 
  -   "You could just symlink it to $maybe[0]" :
  - "You might need to install Perl from source";
  - phat_warn(<