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 Thu, 19 Sep 2002 05:43:16 GMT
jerenkrantz    2002/09/18 22:43:16

  Modified:    .        configure.in acinclude.m4
               support  apxs.in
  Log:
  Rework the apxs -cp command to work when the source dir isn't available by
  querying apr-config and apu-config at link-time instead.
  
  (Note that the $apr_config value in configure.in isn't sufficient as we
  need to know where apr-config will be when we execute apxs later on -
  hence the --bindir option to apr-config and apu-config.)
  
  Revision  Changes    Path
  1.231     +2 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.230
  retrieving revision 1.231
  diff -u -u -r1.230 -r1.231
  --- configure.in	30 Aug 2002 15:16:11 -0000	1.230
  +++ configure.in	19 Sep 2002 05:43:16 -0000	1.231
  @@ -81,6 +81,7 @@
   APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
   APR_ADDTO(INCLUDES, `$apr_config --includes`)
   SHLIBPATH_VAR=`$apr_config --shlib-path-var`
  +APR_BINDIR=`$apr_config --bindir`
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
   
  @@ -99,6 +100,7 @@
   
   APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
   APR_ADDTO(INCLUDES, `$apu_config --includes`)
  +APU_BINDIR=`$apu_config --bindir`
   
   echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
   
  
  
  
  1.132     +2 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -u -r1.131 -r1.132
  --- acinclude.m4	9 Sep 2002 21:37:57 -0000	1.131
  +++ acinclude.m4	19 Sep 2002 05:43:16 -0000	1.132
  @@ -85,6 +85,8 @@
     APACHE_SUBST(MK_IMPLIB)
     APACHE_SUBST(INSTALL_PROG_FLAGS)
     APACHE_SUBST(DSO_MODULES)
  +  APACHE_SUBST(APR_BINDIR)
  +  APACHE_SUBST(APU_BINDIR)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  
  
  
  1.47      +19 -2     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -u -r1.46 -r1.47
  --- apxs.in	19 Sep 2002 01:06:17 -0000	1.46
  +++ apxs.in	19 Sep 2002 05:43:16 -0000	1.47
  @@ -450,10 +450,27 @@
       }
   
       if ($opt_p == 1) {
  -      $opt .= " ".get_vars("EXTRA_LDFLAGS")." ".get_vars("AP_LIBS");
  +        my $apr_bindir = get_vars("APR_BINDIR");
  +        my $apu_bindir = get_vars("APU_BINDIR");
  +
  +        if (! -x "$apr_bindir/apr-config") {
  +            error("$apr_bindir/apr-config not found!");
  +            exit(1);
  +        }
  +        if (! -x "$apu_bindir/apu-config") {
  +            error("$apu_bindir/apu-config not found!");
  +            exit(1);
  +        }
  +        
  +        my $apr_libs=`$apr_bindir/apr-config --ldflags --link-libtool --libs`;
  +        chomp($apr_libs);
  +        my $apu_libs=`$apu_bindir/apu-config --ldflags --link-libtool --libs`;
  +        chomp($apu_libs);
  +        
  +        $opt .= " ".$apu_libs." ".$apr_libs;
       }
       else {
  -      $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
  +        $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
       }
   
       push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt
$lo");
  
  
  

Mime
View raw message