perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: modperl/lib/Apache src.pm
Date Thu, 16 Mar 2000 19:47:18 GMT
dougm       00/03/16 11:47:16

  Modified:    .        Changes MANIFEST Makefile.PL
               apaci    .cvsignore configure
               lib/Apache src.pm
  Added:       apaci    apxs_cflags.PL
  Log:
  fixup the output of apxs -q CFLAGS to preserve quoting (again)
  
  Revision  Changes    Path
  1.430     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.429
  retrieving revision 1.430
  diff -u -r1.429 -r1.430
  --- Changes	2000/03/15 10:27:29	1.429
  +++ Changes	2000/03/16 19:47:06	1.430
  @@ -10,6 +10,8 @@
   
   =item 1.21_04-dev
   
  +fixup the output of apxs -q CFLAGS to preserve quoting (again)
  +
   =item 1.21_03 - March 15, 2000
   
   removed the generated apaci/mod_perl.config from MANIFEST
  
  
  
  1.63      +1 -0      modperl/MANIFEST
  
  Index: MANIFEST
  ===================================================================
  RCS file: /home/cvs/modperl/MANIFEST,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- MANIFEST	2000/03/15 10:16:12	1.62
  +++ MANIFEST	2000/03/16 19:47:07	1.63
  @@ -224,6 +224,7 @@
   apaci/mod_perl.config.sh
   apaci/load_modules.pl.PL
   apaci/find_source.PL
  +apaci/apxs_cflags.PL
   apaci/mod_perl.exp
   .gdbinit
   INSTALL.simple
  
  
  
  1.149     +4 -2      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- Makefile.PL	2000/03/15 10:16:12	1.148
  +++ Makefile.PL	2000/03/16 19:47:08	1.149
  @@ -131,6 +131,7 @@
      t/report
      t/httpd
      apaci/find_source
  +   apaci/apxs_cflags
      apaci/mod_perl.config
   };
   #t/conf/httpd.conf
  @@ -147,6 +148,7 @@
   gen_script("t/net/perl/cgi.pl");
   gen_script("t/report");
   gen_script("apaci/find_source");
  +gen_script("apaci/apxs_cflags");
   write_version_h("src/modules/perl");
   
   my(@test_pre_init) = qq(
  @@ -357,12 +359,12 @@
       if(-e $USE_APXS and !(-d _)) {
           $WITH_APXS = $USE_APXS;
       }
  -    elsif($USE_APXS and $APACHE_PREFIX) {
  +    if(not -x $WITH_APXS and $USE_APXS and $APACHE_PREFIX) {
   	for (qw(sbin bin)) {
   	    last if -e ($WITH_APXS = "$APACHE_PREFIX/$_/apxs");
   	}
       }
  -    unless ($WITH_APXS) {
  +    unless (-x $WITH_APXS) {
   	chomp($WITH_APXS = `which apxs`);
       }
   
  
  
  
  1.3       +1 -0      modperl/apaci/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/modperl/apaci/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore	1998/07/20 16:16:30	1.2
  +++ .cvsignore	2000/03/16 19:47:10	1.3
  @@ -1,2 +1,3 @@
   load_modules.pl
   find_source
  +apxs_cflags
  \ No newline at end of file
  
  
  
  1.11      +1 -1      modperl/apaci/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/modperl/apaci/configure,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- configure	2000/03/09 20:07:25	1.10
  +++ configure	2000/03/16 19:47:11	1.11
  @@ -71,7 +71,7 @@
       exit 1
   fi
   my_apxs_sourcedir="`$my_apxs -q PREFIX`"
  -my_apxs_cflags="`$my_apxs -q CFLAGS | sed -e 's,\",\\\\",g'`"
  +my_apxs_cflags="`./apxs_cflags $my_apxs`"
   my_apxs_includes="-I`$my_apxs -q INCLUDEDIR`"
   my_apxs_libexec="`$my_apxs -q LIBEXECDIR`"
   
  
  
  
  1.1                  modperl/apaci/apxs_cflags.PL
  
  Index: apxs_cflags.PL
  ===================================================================
  use lib qw(./lib ../lib);
  use Apache::src ();
  
  local $Apache::src::APXS = shift;
  
  print Apache::src::apxs_cflags();
  
  
  
  1.21      +17 -2     modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- src.pm	2000/03/15 09:27:57	1.20
  +++ src.pm	2000/03/16 19:47:14	1.21
  @@ -1,7 +1,7 @@
   package Apache::src;
   
   use strict;
  -use vars qw($VERSION $AUTOLOAD);
  +use vars qw($VERSION);
   use File::Path ();
   use IO::File ();
   use Cwd ();
  @@ -15,13 +15,28 @@
   $VERSION = '0.01';
   sub IS_MOD_PERL_BUILD () {-e "../lib/mod_perl.pm"}
   my $Is_Win32 = ($^O eq "MSWin32");
  +$Apache::src::APXS = "";
   
   sub apxs {
       my $self = shift;
       require Apache::MyConfig;
  -    my $apxs = $Apache::MyConfig::Setup{'APXS'};
  +    my $apxs;
  +    for ($Apache::src::APXS,
  +	 $Apache::MyConfig::Setup{'APXS'},
  +	 `which apxs`,
  +	 "/usr/local/apache/bin/apxs")
  +      {
  +	  last if -x ($apxs = $_);
  +      }
       return "" unless $apxs and -x $apxs;
       `$apxs @_`;
  +}
  +
  +sub apxs_cflags {
  +    my $cflags = __PACKAGE__->apxs(-q => 'CFLAGS');
  +    #$cflags =~ s/-D\w+=\".*\"//g; #get rid of -Ds with quotes
  +    $cflags =~ s/\"/\\\"/g;
  +    $cflags;
   }
   
   sub new {
  
  
  

Mime
View raw message