Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 13 Aug 2004 09:38:12 -0000
Message-ID: <20040813093812.11279.qmail@minotaur.apache.org>
From: jorton@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 acinclude.m4 configure.in

jorton      2004/08/13 02:38:12

  Modified:    support  apxs.in
               .        acinclude.m4 configure.in
  Log:
  * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location
  of installed ap[ru]-config scripts so third-party modules can use
  `apxs -q APR_CONFIG`.
  
  * support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
  --apr-libtool.
  
  Revision  Changes    Path
  1.62      +4 -11     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -d -w -u -r1.61 -r1.62
  --- apxs.in	2 Aug 2004 02:38:16 -0000	1.61
  +++ apxs.in	13 Aug 2004 09:38:11 -0000	1.62
  @@ -323,29 +323,22 @@
       print "$result\n";
   }
   
  -my $apr_bindir = get_vars("APR_BINDIR");
  -my $apr_version = get_vars("APR_VERSION");
  -$apr_version =~ s/(\d+)\.(\d).(\d)/$1/;
  -my $apr_config="$apr_bindir/apr-$apr_version-config";
  +my $apr_config = get_vars("APR_CONFIG");
   
   if (! -x "$apr_config") {
  -    error("$apr_bindir/apr-config not found!");
  +    error("$apr_config not found!");
       exit(1);
   }
   
  -my $apu_bindir = get_vars("APU_BINDIR");
  -my $apu_version = get_vars("APU_VERSION");
  -$apu_version =~ s/(\d+)\.(\d).(\d)/$1/;
  -my $apu_config="$apu_bindir/apu-$apu_version-config";
  +my $apu_config = get_vars("APU_CONFIG");
   
   if (! -x "$apu_config") {
       error("$apu_config not found!");
       exit(1);
   }
   
  -my $libtool = `$apr_config --installbuilddir`;
  +my $libtool = `$apr_config --apr-libtool`;
   chomp($libtool);
  -$libtool = "$libtool/libtool";
   
   my $apr_includedir = `$apr_config --includes`;
   chomp($apr_includedir);
  
  
  
  1.154     +2 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -d -w -u -r1.153 -r1.154
  --- acinclude.m4	2 Aug 2004 02:38:16 -0000	1.153
  +++ acinclude.m4	13 Aug 2004 09:38:11 -0000	1.154
  @@ -91,9 +91,11 @@
     APACHE_SUBST(APR_BINDIR)
     APACHE_SUBST(APR_INCLUDEDIR)
     APACHE_SUBST(APR_VERSION)
  +  APACHE_SUBST(APR_CONFIG)
     APACHE_SUBST(APU_BINDIR)
     APACHE_SUBST(APU_INCLUDEDIR)
     APACHE_SUBST(APU_VERSION)
  +  APACHE_SUBST(APU_CONFIG)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  
  
  
  1.264     +2 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -d -w -u -r1.263 -r1.264
  --- configure.in	2 Aug 2004 02:38:16 -0000	1.263
  +++ configure.in	13 Aug 2004 09:38:11 -0000	1.264
  @@ -86,6 +86,7 @@
   APR_BINDIR=`$apr_config --bindir`
   APR_INCLUDEDIR=`$apr_config --includedir`
   APR_VERSION=`$apr_config --version`
  +APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
   
  @@ -109,6 +110,7 @@
   APU_BINDIR=`$apu_config --bindir`
   APU_INCLUDEDIR=`$apu_config --includedir`
   APU_VERSION=`$apu_config --version`
  +APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
   
   dnl In case we picked up CC and CPP from APR, get that info into the
   dnl config cache so that PCRE uses it.  Otherwise, CC and CPP used for