apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util CHANGES apu-config.in
Date Mon, 30 Aug 2004 04:20:16 GMT
jerenkrantz    2004/08/29 21:20:16

  Modified:    .        Tag: APU_0_9_BRANCH CHANGES apu-config.in
  Log:
  If available, use 'readlink -f' to resolve symlinks in apu-config.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.117.2.10 +3 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.117.2.9
  retrieving revision 1.117.2.10
  diff -u -u -r1.117.2.9 -r1.117.2.10
  --- CHANGES	27 May 2004 21:55:01 -0000	1.117.2.9
  +++ CHANGES	30 Aug 2004 04:20:16 -0000	1.117.2.10
  @@ -1,5 +1,8 @@
   Changes with APR-util 0.9.5
   
  +  *) If available, use 'readlink -f' to resolve symlinks in apu-config.
  +     [Justin Erenkrantz]
  +
     *) Fix corrupt output from the apr_xlate_* interfaces on AIX 4.x.
        [Joe Orton]
   
  
  
  
  1.34.2.2  +13 -7     apr-util/apu-config.in
  
  Index: apu-config.in
  ===================================================================
  RCS file: /home/cvs/apr-util/apu-config.in,v
  retrieving revision 1.34.2.1
  retrieving revision 1.34.2.2
  diff -u -u -r1.34.2.1 -r1.34.2.2
  --- apu-config.in	26 Feb 2004 22:03:46 -0000	1.34.2.1
  +++ apu-config.in	30 Aug 2004 04:20:16 -0000	1.34.2.2
  @@ -82,14 +82,20 @@
   fi
   # If we have the realpath program, use it to resolve symlinks.
   # Otherwise, being in a symlinked dir may result in incorrect output.
  +REALPATH=
   if test -x "`which realpath 2>/dev/null`"; then
  -    thisdir="`realpath $thisdir`"
  -    if test -d "$APU_SOURCE_DIR"; then
  -        APU_SOURCE_DIR="`realpath $APU_SOURCE_DIR`"
  -    fi
  -    if test -n "$tmpbindir"; then
  -        tmpbindir="`realpath $tmpbindir`"
  -    fi
  +  REALPATH=realpath
  +elif test -x "`which readlink 2>/dev/null`"; then
  +  REALPATH="readlink -f"
  +fi
  +if test -n "$REALPATH"; then
  +  thisdir="`$REALPATH $thisdir`"
  +  if test -d "$APU_SOURCE_DIR"; then
  +    APR_SOURCE_DIR="`$REALPATH $APU_SOURCE_DIR`"
  +  fi
  +  if test -n "$tmpbindir"; then
  +    tmpbindir="`$REALPATH $tmpbindir`"
  +  fi
   fi
   if test "$tmpbindir" = "$thisdir"; then
       location=installed
  
  
  

Mime
View raw message