apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr CHANGES apr-config.in
Date Sun, 23 Mar 2003 03:29:23 GMT
jerenkrantz    2003/03/22 19:29:23

  Modified:    .        CHANGES apr-config.in
  Log:
  Fix error in apr-config when symlinks are involved.
  
  Submitted by:	Garrett Rooney <rooneg@electricjellyfish.net>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.390     +2 -1      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.389
  retrieving revision 1.390
  diff -u -u -r1.389 -r1.390
  --- CHANGES	22 Mar 2003 03:25:17 -0000	1.389
  +++ CHANGES	23 Mar 2003 03:29:23 -0000	1.390
  @@ -1,6 +1,7 @@
   Changes with APR 0.9.3
   
  -
  +  *) Fix error in apr-config when symlinks are involved.
  +     [Garrett Rooney <rooneg@electricjellyfish.net>]
   
   Changes with APR 0.9.2
   
  
  
  
  1.32      +9 -6      apr/apr-config.in
  
  Index: apr-config.in
  ===================================================================
  RCS file: /home/cvs/apr/apr-config.in,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -u -r1.31 -r1.32
  --- apr-config.in	6 Mar 2003 00:14:41 -0000	1.31
  +++ apr-config.in	23 Mar 2003 03:29:23 -0000	1.32
  @@ -123,16 +123,19 @@
   
   thisdir="`dirname $0`"
   thisdir="`cd $thisdir && pwd`"
  -# If we have the realpath program, use it to resolve symlinks.
  -# Otherwise, being in a symlinked dir may result in incorrect output.
  -if test -x "`which realpath 2>/dev/null`"; then
  -  thisdir="`realpath $thisdir`"
  -  APR_SOURCE_DIR="`realpath $APR_SOURCE_DIR`"
  -fi
   if test -d $bindir; then
     tmpbindir="`cd $bindir && pwd`"
   else
     tmpbindir=""
  +fi
  +# If we have the realpath program, use it to resolve symlinks
  +# Otherwise, being in a symlinked dir may result in incorrect output.
  +if test -x "`which realpath 2>/dev/null`"; then
  +  thisdir="`realpath $thisdir`"
  +  APR_SOURCE_DIR="`realpath $APR_SOURCE_DIR`"
  +  if test -n $tmpbindir; then
  +    tmpbindir="`realpath $tmpbindir`"
  +  fi
   fi
   if test "$tmpbindir" = "$thisdir"; then
     location=installed
  
  
  

Mime
View raw message