httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: apache-2.0/src/support apxs.in
Date Sun, 25 Jun 2000 23:44:16 GMT
dougm       00/06/25 16:44:16

  Modified:    src/support apxs.in
  Log:
  allow apxs to be run from the source tree, before installation (e.g. perl ../apache-2.0/src/support/apxs
-q CFLAGS)
  
  Revision  Changes    Path
  1.10      +12 -4     apache-2.0/src/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/apxs.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apxs.in	2000/05/05 21:11:06	1.9
  +++ apxs.in	2000/06/25 23:44:16	1.10
  @@ -219,15 +219,23 @@
   ##
   ##  Initial shared object support check
   ##
  -if (not -x "$CFG_SBINDIR/$CFG_TARGET") {
  -	print STDERR "apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
  +my $httpd = "$CFG_SBINDIR/$CFG_TARGET";
  +
  +#allow apxs to be run from the source tree, before installation
  +if ($0 =~ m:support/apxs$:) {
  +    ($httpd = $0) =~ s:support/apxs$::;
  +    $httpd .= $CFG_TARGET;
  +}
  +
  +if (not -x $httpd) {
  +	print STDERR "apxs:Error: $httpd not found or not executable\n";
   	exit(1);
   }
  -if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
  +if (not grep(/mod_so/, `$httpd -l`)) {
       print STDERR "apxs:Error: Sorry, no shared object support for Apache\n";
       print STDERR "apxs:Error: available under your platform. Make sure\n";
       print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
  -    print STDERR "apxs:Error: your server binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
  +    print STDERR "apxs:Error: your server binary `$httpd'.\n";
       exit(1);
   }
   
  
  
  

Mime
View raw message