cvs commit: modperl/lib/Apache src.pm

[dougm]

dougm       00/09/26 13:20:00

  Modified:    .        Changes
               apaci    mod_perl.config.sh
               lib/Apache src.pm
  Log:
  static+apaci fixes for aix
  
  Revision  Changes    Path
  1.523     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.522
  retrieving revision 1.523
  diff -u -r1.522 -r1.523
  --- Changes   2000/09/26 18:42:02     1.522
  +++ Changes   2000/09/26 20:11:03     1.523
  @@ -10,6 +10,8 @@
   
   =item 1.24_01-dev
   
  +static+apaci fixes for aix [Jens-Uwe Mager <[EMAIL PROTECTED]>]
  +
   fix bug in Perl{Set,Add}Var so $r->dir_config->get('key') sees the
   same values as $r->dir_config('key'), thanks to Geoffrey Young for the spot
   
  
  
  
  1.19      +7 -0      modperl/apaci/mod_perl.config.sh
  
  Index: mod_perl.config.sh
  ===================================================================
  RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_perl.config.sh        2000/03/31 05:16:05     1.18
  +++ mod_perl.config.sh        2000/09/26 20:15:06     1.19
  @@ -147,6 +147,13 @@
   print $ldopts;
   EOT
   perl_libs="`$perl_interp $tmpfile2 $perl_libperl`"
  +if test $build_type = OBJ
  +then
  +     case "$os_version" in
  +         aix*)  perl_libs="$perl_libs -bE:\$(SRCDIR)/modules/perl/mod_perl.exp" ;;
  +         * )    ;;
  +     esac
  +fi
   perl_inc="`$perl_interp -MConfig -e 'print "$Config{archlibexp}/CORE"'`"
   perl_privlibexp="`$perl_interp -MConfig -e 'print $Config{privlibexp}'`"
   perl_archlibexp="`$perl_interp -MConfig -e 'print $Config{archlibexp}'`"
  
  
  
  1.27      +6 -1      modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- src.pm    2000/06/05 18:16:33     1.26
  +++ src.pm    2000/09/26 20:16:52     1.27
  @@ -258,7 +258,12 @@
            push @ldflags, "-bI:" . $file;
        }
        my $httpdexp = $self->apxs("-q" => 'LIBEXECDIR') . "/httpd.exp";
  -     push @ldflags, "-bI:$httpdexp" if -e $httpdexp;
  +     if (-e $httpdexp) {
  +             push @ldflags, "-bI:$httpdexp";
  +     } else {
  +             $httpdexp = $self->dir . "/support/httpd.exp";
  +             push @ldflags, "-bI:$httpdexp" if -e $httpdexp;
  +     }
       }
       return join(' ', @ldflags);
   }