httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support apxs.in
Date Fri, 24 Jan 2003 09:26:47 GMT
trawick     2003/01/24 01:26:47

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               support  Tag: APACHE_2_0_BRANCH apxs.in
  Log:
  Merge this fix from 2.1-dev, remove vote in STATUS:
  
  apxs: Include any special APR ld flags when linking the DSO.
  This resolves problems on AIX when building a DSO with apxs+gcc.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.24 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.23
  retrieving revision 1.988.2.24
  diff -u -r1.988.2.23 -r1.988.2.24
  --- CHANGES	22 Jan 2003 10:26:37 -0000	1.988.2.23
  +++ CHANGES	24 Jan 2003 09:26:45 -0000	1.988.2.24
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.45
   
  +  *) apxs: Include any special APR ld flags when linking the DSO.
  +     This resolves problems on AIX when building a DSO with apxs+gcc.
  +     [Jeff Trawick]
  +
      *) Added character set support to mod_auth_LDAP to allow it to 
        convert extended characters used in the user ID to UTF-8 
        before authenticating against the LDAP directory. The new
  
  
  
  1.751.2.60 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.59
  retrieving revision 1.751.2.60
  diff -u -r1.751.2.59 -r1.751.2.60
  --- STATUS	24 Jan 2003 08:39:40 -0000	1.751.2.59
  +++ STATUS	24 Jan 2003 09:26:46 -0000	1.751.2.60
  @@ -79,10 +79,6 @@
         -1: brianp (we need a more robust solution than what's in 2.1 right now),
             jerenkrantz (should be fixed, but I don't have time to do this)
   
  -    * apxs fix to include any special APR ld flags when linking a DSO
  -      This is revision 1.50 of support/apxs.in
  -      +1: trawick, orlikowski, striker
  -
   CURRENT RELEASE NOTES:
   
       * Backwards compatibility is expected of future Apache 2.0 releases,
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.47.2.1  +10 -6     httpd-2.0/support/apxs.in
  
  Index: apxs.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
  retrieving revision 1.47
  retrieving revision 1.47.2.1
  diff -u -r1.47 -r1.47.2.1
  --- apxs.in	19 Sep 2002 05:43:16 -0000	1.47
  +++ apxs.in	24 Jan 2003 09:26:47 -0000	1.47.2.1
  @@ -449,14 +449,16 @@
           $opt .= " -l$opt_l";
       }
   
  +    my $apr_bindir = get_vars("APR_BINDIR");
  +
  +    if (! -x "$apr_bindir/apr-config") {
  +        error("$apr_bindir/apr-config not found!");
  +        exit(1);
  +    }
  +
       if ($opt_p == 1) {
  -        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);
  @@ -470,7 +472,9 @@
           $opt .= " ".$apu_libs." ".$apr_libs;
       }
       else {
  -        $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
  +        my $apr_ldflags=`$apr_bindir/apr-config --ldflags`;
  +        chomp($apr_ldflags);
  +        $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
       }
   
       push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt
$lo");
  
  
  

Mime
View raw message