perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0 Changes
Date Tue, 27 Apr 2004 00:27:39 GMT
stas        2004/04/26 17:27:39

  Modified:    src/modules/perl modperl_gtop.h
               lib/Apache Build.pm
               .        Changes
  Log:
  add support for libgtop 2.5.0+
  
  Revision  Changes    Path
  1.6       +2 -0      modperl-2.0/src/modules/perl/modperl_gtop.h
  
  Index: modperl_gtop.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- modperl_gtop.h	4 Mar 2004 06:01:07 -0000	1.5
  +++ modperl_gtop.h	27 Apr 2004 00:27:38 -0000	1.6
  @@ -25,7 +25,9 @@
   #include <glibtop.h>
   #include <glibtop/open.h>
   #include <glibtop/close.h>
  +#ifndef GTOP_2_5_PLUS
   #include <glibtop/xmalloc.h>
  +#endif
   #include <glibtop/parameter.h>
   #include <glibtop/union.h>
   #include <glibtop/sysdeps.h>
  
  
  
  1.161     +9 -0      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.160
  retrieving revision 1.161
  diff -u -u -r1.160 -r1.161
  --- Build.pm	5 Apr 2004 21:45:08 -0000	1.160
  +++ Build.pm	27 Apr 2004 00:27:39 -0000	1.161
  @@ -274,6 +274,15 @@
           # 2.0.0 bugfix
           chomp(my $libdir = qx|pkg-config --variable=libdir libgtop-2.0|);
           $c{ldopts} =~ s|\$\(libdir\)|$libdir|;
  +
  +        chomp($c{ver} = qx|pkg-config --modversion libgtop-2.0|);
  +        ($c{ver_maj}, $c{ver_min}) = split /\./, $c{ver};
  +        if ($c{ver_maj} == 2 && $c{ver_min} >= 5) {
  +            # some headers were removed in libgtop 2.5.0 so we need to
  +            # be able to exclude them at compile time
  +            $c{ccopts} .= ' -DGTOP_2_5_PLUS';
  +        }
  +
       }
       elsif (system('gnome-config --libs libgtop') == 0) {
           chomp($c{ccopts} = qx|gnome-config --cflags libgtop|);
  
  
  
  1.362     +2 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.361
  retrieving revision 1.362
  diff -u -u -r1.361 -r1.362
  --- Changes	23 Apr 2004 18:00:31 -0000	1.361
  +++ Changes	27 Apr 2004 00:27:39 -0000	1.362
  @@ -12,6 +12,8 @@
   
   =item 1.99_14-dev
   
  +add support for libgtop 2.5.0+ (maintenance mode) [Stas]
  +
   APR::Socket::timeout_set now croaks on failure [Stas]
   
   significantly speedup the startup of threaded mpm test suite, by
  
  
  

Mime
View raw message