jerenkrantz 2003/01/08 01:47:04
Modified: . CHANGES apr-config.in
Log:
Allow apr-config to work in symlinked install directories when 'realpath' is
available.
(Darwin and FreeBSD have realpath. Solaris doesn't.)
Revision Changes Path
1.368 +4 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -u -r1.367 -r1.368
--- CHANGES 6 Jan 2003 23:50:46 -0000 1.367
+++ CHANGES 8 Jan 2003 09:47:04 -0000 1.368
@@ -1,4 +1,8 @@
Changes with APR 0.9.2
+
+ *) Allow apr-config to work in symlinked install directories when
+ 'realpath' is available. [Justin Erenkrantz]
+
*) Namespace protect the header files in include/arch
[Thom May]
1.27 +5 -0 apr/apr-config.in
Index: apr-config.in
===================================================================
RCS file: /home/cvs/apr/apr-config.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- apr-config.in 1 Jan 2003 00:01:41 -0000 1.26
+++ apr-config.in 8 Jan 2003 09:47:04 -0000 1.27
@@ -121,6 +121,11 @@
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`"
+fi
if test -d $bindir; then
tmpbindir="`cd $bindir && pwd`"
else
