Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 21 May 2003 06:56:35 -0000
Message-ID: <20030521065635.34190.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/support apxs.in

jerenkrantz    2003/05/20 23:56:35

  Modified:    support  apxs.in
  Log:
  Perform run-time query in apxs for apr and apr-util's includes.
  
  This is required when they are in disjoint directories from httpd.  Otherwise,
  apxs won't pass their include information into the compiler and the
  compilation will fail.
  
  Revision  Changes    Path
  1.55      +13 -7     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -u -r1.54 -r1.55
  --- apxs.in	4 Apr 2003 19:04:21 -0000	1.54
  +++ apxs.in	21 May 2003 06:56:35 -0000	1.55
  @@ -369,10 +369,22 @@
       exit(1);
   }
   
  +my $apu_bindir = get_vars("APU_BINDIR");
  +
  +if (! -x "$apu_bindir/apu-config") {
  +    error("$apu_bindir/apu-config not found!");
  +    exit(1);
  +}
  +
   my $libtool = `$apr_bindir/apr-config --installbuilddir`;
   chomp($libtool);
   $libtool = "$libtool/libtool";
   
  +my $apr_includedir = `$apr_bindir/apr-config --includes`;
  +chomp($apr_includedir);
  +my $apu_includedir = `$apu_bindir/apu-config --includes`;
  +chomp($apu_includedir);
  +
   if ($opt_c) {
       ##
       ##  SHARED OBJECT COMPILATION
  @@ -435,7 +447,7 @@
           $la =~ s|\.c$|.la|;
           my $o = $s;
           $o =~ s|\.c$|.o|;
  -        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
  +        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
           unshift(@objs, $lo);
       }
   
  @@ -461,12 +473,6 @@
       }
   
       if ($opt_p == 1) {
  -        my $apu_bindir = get_vars("APU_BINDIR");
  -
  -        if (! -x "$apu_bindir/apu-config") {
  -            error("$apu_bindir/apu-config not found!");
  -            exit(1);
  -        }
           
           my $apr_libs=`$apr_bindir/apr-config --cflags --ldflags --link-libtool --libs`;
           chomp($apr_libs);