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/apaci mod_perl.config mod_perl.config.sh
Date Sat, 18 Jul 1998 22:21:17 GMT
dougm       98/07/18 15:21:16

  Modified:    .        Changes Makefile.PL
               apaci    mod_perl.config mod_perl.config.sh
  Log:
  PERL_DEBUG=1 w/ USE_APACI=1 will properly link against libperld if exists
  Ralf, does this look okay??
  
  Revision  Changes    Path
  1.83      +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- Changes	1998/07/18 21:58:27	1.82
  +++ Changes	1998/07/18 22:21:12	1.83
  @@ -8,6 +8,8 @@
   
   =item 1.13_01-dev
   
  +PERL_DEBUG=1 and USE_APACI=1 will properly link against libperld if exists
  +
   remove mod_perl.pm_version file.  move Makefile.PL-time generated code
   from mod_perl.pm.PL to mod_perl_hooks.pm.PL, remove mod_perl.pm.PL and
   ship with a mod_perl.pm again that is not modified by Makefile.PL so
  
  
  
  1.70      +12 -2     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- Makefile.PL	1998/07/18 18:59:34	1.69
  +++ Makefile.PL	1998/07/18 22:21:13	1.70
  @@ -135,6 +135,7 @@
       NONE => "", 
   );	     
   
  +$LIBPERL = "DEFAULT";
   $USE_APACI = $USE_DSO = $USE_APXS = 0;
   $WITH_APXS = "";
   $APACI_ARGS = "";
  @@ -443,7 +444,8 @@
   	if($PERL_DEBUG) {
   	    my $lib = "$Config{archlibexp}/CORE/libperld$Config{lib_ext}";
   	    if (-e $lib) {
  -		$libperl = " -- -lperld";
  +		$LIBPERL = "-lperld";
  +		$libperl = " -- $LIBPERL";
   	    }
   	    $PERL_EXTRA_CFLAGS .= " -g";
   	    $PERL_TRACE=1;
  @@ -919,6 +921,13 @@
       ");\n1;\n";
       close FH;
   
  +    for my $f (qw(.htaccess hooks.txt)) {
  +	open FH, ">t/docs/$f";
  +	print FH " ";
  +	close FH;
  +	chmod 0666, "t/docs/$f";#make sure httpd can write to it
  +    }
  +
       if($PERL_SSI) {
   	cp "t/modules/ssi.test", "t/modules/ssi.t";
       }
  @@ -1742,11 +1751,12 @@
   
   #   Perl interpreter to use 
   PERL = $^X
  -
  +LIBPERL = $LIBPERL
   PERL_STATIC_EXTS = @xs_modules $PERL_STATIC_EXTS
   PERL_STATIC_SRCS = @static_src
   
   EOF
  +
       for (qw(PERL_SECTIONS PERL_SSI PERL_TRACE)) {
   	my $yes_no = $$_ ? "yes" : "no";
   	print $apaci_cfg "$_ = $yes_no\n";
  
  
  
  1.4       +2 -0      modperl/apaci/mod_perl.config
  
  Index: mod_perl.config
  ===================================================================
  RCS file: /export/home/cvs/modperl/apaci/mod_perl.config,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_perl.config	1998/06/04 15:16:07	1.3
  +++ mod_perl.config	1998/07/18 22:21:14	1.4
  @@ -8,6 +8,8 @@
   #   Perl interpreter to use 
   PERL = DEFAULT
   
  +LIBPERL = DEFAULT
  +
   #   Modules to compile statically into mod_perl
   PERL_STATIC_EXTS = Apache Apache::Constants Apache::ModuleConfig
   PERL_STATIC_SRCS = Apache.c Constants.c ModuleConfig.c
  
  
  
  1.7       +7 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_perl.config.sh	1998/06/08 16:12:40	1.6
  +++ mod_perl.config.sh	1998/07/18 22:21:14	1.7
  @@ -66,6 +66,12 @@
   #
   #   determine Perl interpreter and version
   #
  +libperl="$param_LIBPERL"
  +if [ ".$libperl" = .DEFAULT ]; then
  +    perl_libperl=""
  +else
  +    perl_libperl=" -- $libperl"
  +fi
   perl_interp="$param_PERL"
   if [ ".$perl_interp" = .DEFAULT ]; then
       if [ ".$PERL" != . ]; then
  @@ -125,7 +131,7 @@
   =cut
   print $ldopts;
   EOT
  -perl_libs="`$perl_interp $tmpfile2`"
  +perl_libs="`$perl_interp $tmpfile2 $perl_libperl`"
   perl_inc="`$perl_interp -MExtUtils::Embed -e perl_inc`"
   perl_privlibexp="`$perl_interp -MConfig -e 'print $Config{privlibexp}'`"
   perl_archlibexp="`$perl_interp -MConfig -e 'print $Config{archlibexp}'`"
  
  
  

Mime
View raw message