You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2004/08/30 06:19:22 UTC
cvs commit: apr CHANGES apr-config.in
jerenkrantz 2004/08/29 21:19:22
Modified: . Tag: APR_0_9_BRANCH CHANGES apr-config.in
Log:
If available, use 'readlink -f' to resolve symlinks in apr-config.
Revision Changes Path
No revision
No revision
1.426.2.30 +4 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.29
retrieving revision 1.426.2.30
diff -u -u -r1.426.2.29 -r1.426.2.30
--- CHANGES 21 Jul 2004 21:32:54 -0000 1.426.2.29
+++ CHANGES 30 Aug 2004 04:19:21 -0000 1.426.2.30
@@ -1,4 +1,8 @@
Changes with APR 0.9.5
+
+ *) If available, use 'readlink -f' to resolve symlinks in apr-config.
+ [Justin Erenkrantz]
+
*) Win32: Fix bug in apr_socket_sendfile that interferred with
Win32 LSPs. Bug is described in Apache 2.0 bugzilla report
23982 [Jan Bilek, Bill Stoddard]
1.36.2.1 +9 -3 apr/apr-config.in
Index: apr-config.in
===================================================================
RCS file: /home/cvs/apr/apr-config.in,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -u -r1.36 -r1.36.2.1
--- apr-config.in 24 Aug 2003 23:10:25 -0000 1.36
+++ apr-config.in 30 Aug 2004 04:19:21 -0000 1.36.2.1
@@ -132,13 +132,19 @@
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`"
+ 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 "$APR_SOURCE_DIR"; then
- APR_SOURCE_DIR="`realpath $APR_SOURCE_DIR`"
+ APR_SOURCE_DIR="`$REALPATH $APR_SOURCE_DIR`"
fi
if test -n "$tmpbindir"; then
- tmpbindir="`realpath $tmpbindir`"
+ tmpbindir="`$REALPATH $tmpbindir`"
fi
fi
if test "$tmpbindir" = "$thisdir"; then
Re: cvs commit: apr CHANGES apr-config.in
Posted by Joe Orton <jo...@redhat.com>.
On Tue, Aug 31, 2004 at 11:19:53PM -0700, Justin Erenkrantz wrote:
> --On Wednesday, September 1, 2004 7:15 AM +0100 Joe Orton
> <jo...@redhat.com> wrote:
>
> >This has broken the build on the various Linuxes that have a readlink
> >that doesn't support -f. I'll backport the proper fixes for this stuff
> >from HEAD.
>
> Oh, that sucks. Sorry. Out of curiosity, when was 'readlink -f'
> introduced? Both Debian and RHEL have it (that's all I have access to).
It looks like RHL9 and later, where /usr/bin/readlink is the GNU
coreutils implementation, which does support -f and -n. In earlier
releases readlink was part of the teTeX package, strangely.
joe
Re: cvs commit: apr CHANGES apr-config.in
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Wednesday, September 1, 2004 7:15 AM +0100 Joe Orton <jo...@redhat.com>
wrote:
> This has broken the build on the various Linuxes that have a readlink
> that doesn't support -f. I'll backport the proper fixes for this stuff
> from HEAD.
Oh, that sucks. Sorry. Out of curiosity, when was 'readlink -f' introduced?
Both Debian and RHEL have it (that's all I have access to).
I thought this would be an easier way to fix it than backporting the whole set
of changes from HEAD. Thanks. I'll let you backport since you did those
changes initially. ;-) -- justin
Re: cvs commit: apr CHANGES apr-config.in
Posted by Joe Orton <jo...@redhat.com>.
On Mon, Aug 30, 2004 at 04:19:22AM -0000, jerenkrantz@apache.org wrote:
> jerenkrantz 2004/08/29 21:19:22
>
> Modified: . Tag: APR_0_9_BRANCH CHANGES apr-config.in
> Log:
> If available, use 'readlink -f' to resolve symlinks in apr-config.
This has broken the build on the various Linuxes that have a readlink
that doesn't support -f. I'll backport the proper fixes for this stuff
from HEAD.