httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/support apxs.in
Date Mon, 02 Aug 2004 02:38:16 GMT
jerenkrantz    2004/08/01 19:38:16

  Modified:    .        configure.in acinclude.m4
               support  apxs.in
  Log:
  Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-config
  
  (httpd-2.1+ will be APR 1.0 or higher which uses this convention.)
  
  Revision  Changes    Path
  1.263     +2 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.262
  retrieving revision 1.263
  diff -u -u -r1.262 -r1.263
  --- configure.in	19 Jul 2004 04:27:13 -0000	1.262
  +++ configure.in	2 Aug 2004 02:38:16 -0000	1.263
  @@ -85,6 +85,7 @@
   SHLIBPATH_VAR=`$apr_config --shlib-path-var`
   APR_BINDIR=`$apr_config --bindir`
   APR_INCLUDEDIR=`$apr_config --includedir`
  +APR_VERSION=`$apr_config --version`
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
   
  @@ -107,6 +108,7 @@
   APR_ADDTO(INCLUDES, `$apu_config --includes`)
   APU_BINDIR=`$apu_config --bindir`
   APU_INCLUDEDIR=`$apu_config --includedir`
  +APU_VERSION=`$apu_config --version`
   
   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
  
  
  
  1.153     +2 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -u -r1.152 -r1.153
  --- acinclude.m4	19 Jul 2004 04:27:13 -0000	1.152
  +++ acinclude.m4	2 Aug 2004 02:38:16 -0000	1.153
  @@ -90,8 +90,10 @@
     APACHE_SUBST(DSO_MODULES)
     APACHE_SUBST(APR_BINDIR)
     APACHE_SUBST(APR_INCLUDEDIR)
  +  APACHE_SUBST(APR_VERSION)
     APACHE_SUBST(APU_BINDIR)
     APACHE_SUBST(APU_INCLUDEDIR)
  +  APACHE_SUBST(APU_VERSION)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  
  
  
  1.61      +15 -9     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -u -r1.60 -r1.61
  --- apxs.in	9 Feb 2004 20:40:52 -0000	1.60
  +++ apxs.in	2 Aug 2004 02:38:16 -0000	1.61
  @@ -324,26 +324,32 @@
   }
   
   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";
   
  -if (! -x "$apr_bindir/apr-config") {
  +if (! -x "$apr_config") {
       error("$apr_bindir/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";
   
  -if (! -x "$apu_bindir/apu-config") {
  -    error("$apu_bindir/apu-config not found!");
  +if (! -x "$apu_config") {
  +    error("$apu_config not found!");
       exit(1);
   }
   
  -my $libtool = `$apr_bindir/apr-config --installbuilddir`;
  +my $libtool = `$apr_config --installbuilddir`;
   chomp($libtool);
   $libtool = "$libtool/libtool";
   
  -my $apr_includedir = `$apr_bindir/apr-config --includes`;
  +my $apr_includedir = `$apr_config --includes`;
   chomp($apr_includedir);
  -my $apu_includedir = `$apu_bindir/apu-config --includes`;
  +my $apu_includedir = `$apu_config --includes`;
   chomp($apu_includedir);
   
   if ($opt_c) {
  @@ -435,15 +441,15 @@
   
       if ($opt_p == 1) {
           
  -        my $apr_libs=`$apr_bindir/apr-config --cflags --ldflags --link-libtool --libs`;
  +        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
           chomp($apr_libs);
  -        my $apu_libs=`$apu_bindir/apu-config --ldflags --link-libtool --libs`;
  +        my $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
           chomp($apu_libs);
           
           $opt .= " ".$apu_libs." ".$apr_libs;
       }
       else {
  -        my $apr_ldflags=`$apr_bindir/apr-config --ldflags`;
  +        my $apr_ldflags=`$apr_config --ldflags`;
           chomp($apr_ldflags);
           $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
       }
  
  
  

Mime
View raw message