jorton 2004/09/01 02:53:51
Modified: . Tag: APR_0_9_BRANCH CHANGES configure.in .cvsignore
Makefile.in apr-config.in
Log:
Backport from HEAD:
Remove "location detection" from apr-config:
* configure.in: Substitute APR_CONFIG_LOCATION as "build" or "source"
appropriately.
* apr-config.in: Set location to @APR_CONFIG_LOCATION@ rather than
fragile pwd/realpath guesswork; pick up and use APR_BUILD_DIR instead
of $thisdir.
* Makefile.in (apr-config.out): New target.
(install): Install apr-config.out instead of apr-config.
PR: 8867
Revision Changes Path
No revision
No revision
1.426.2.31 +5 -2 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.30
retrieving revision 1.426.2.31
diff -d -w -u -r1.426.2.30 -r1.426.2.31
--- CHANGES 30 Aug 2004 04:19:21 -0000 1.426.2.30
+++ CHANGES 1 Sep 2004 09:53:50 -0000 1.426.2.31
@@ -1,7 +1,10 @@
Changes with APR 0.9.5
- *) If available, use 'readlink -f' to resolve symlinks in apr-config.
- [Justin Erenkrantz]
+ *) Fix build issues in paths containing symlinks. PR 8867.
+ [Joe Orton]
+
+ *) Update config.{guess,sub} for DragonFly BSD. PR 29858.
+ [Joe Orton]
*) Win32: Fix bug in apr_socket_sendfile that interferred with
Win32 LSPs. Bug is described in Apache 2.0 bugzilla report
1.535.2.13 +5 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.535.2.12
retrieving revision 1.535.2.13
diff -d -w -u -r1.535.2.12 -r1.535.2.13
--- configure.in 22 Jun 2004 08:45:04 -0000 1.535.2.12
+++ configure.in 1 Sep 2004 09:53:50 -0000 1.535.2.13
@@ -46,7 +46,12 @@
if test "$apr_builddir" != "$apr_srcdir"; then
USE_VPATH=1
+ APR_CONFIG_LOCATION=build
+else
+ APR_CONFIG_LOCATION=source
fi
+
+AC_SUBST(APR_CONFIG_LOCATION)
# Libtool might need this symbol -- it must point to the location of
# the generated libtool script (not necessarily the "top" build dir).
1.16.2.2 +1 -0 apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/.cvsignore,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -d -w -u -r1.16.2.1 -r1.16.2.2
--- .cvsignore 6 Jun 2004 10:20:11 -0000 1.16.2.1
+++ .cvsignore 1 Sep 2004 09:53:50 -0000 1.16.2.2
@@ -29,5 +29,6 @@
*.stt
*.sto
*.vcproj
+apr-config.out
autom4te.cache
ltcf-c.sh
1.87.2.3 +7 -3 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.87.2.2
retrieving revision 1.87.2.3
diff -d -w -u -r1.87.2.2 -r1.87.2.3
--- Makefile.in 6 Jun 2004 10:20:11 -0000 1.87.2.2
+++ Makefile.in 1 Sep 2004 09:53:50 -0000 1.87.2.3
@@ -31,7 +31,7 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-CLEAN_TARGETS = apr.exp exports.c export_vars.c
+CLEAN_TARGETS = apr.exp exports.c export_vars.c apr-config.out
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
libtool apr-config
@@ -60,7 +60,11 @@
fi \
fi
-install: $(TARGET_LIB)
+# Create apr-config script suitable for the install tree
+apr-config.out: apr-config
+ sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
+
+install: $(TARGET_LIB) apr-config.out
if [ ! -d $(DESTDIR)$(includedir) ]; then \
$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
fi;
@@ -90,7 +94,7 @@
if [ ! -d $(DESTDIR)$(bindir) ]; then \
$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
fi;
- $(LIBTOOL) --mode=install cp apr-config $(DESTDIR)$(bindir)
+ $(LIBTOOL) --mode=install cp apr-config.out
$(DESTDIR)$(bindir)/apr-config
chmod 755 $(DESTDIR)$(bindir)/apr-config
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
for i in $(INSTALL_SUBDIRS); do \
1.36.2.2 +11 -38 apr/apr-config.in
Index: apr-config.in
===================================================================
RCS file: /home/cvs/apr/apr-config.in,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -d -w -u -r1.36.2.1 -r1.36.2.2
--- apr-config.in 30 Aug 2004 04:19:21 -0000 1.36.2.1
+++ apr-config.in 1 Sep 2004 09:53:50 -0000 1.36.2.2
@@ -76,10 +76,14 @@
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
SHLIBPATH_VAR="@shlibpath_var@"
APR_SOURCE_DIR="@apr_srcdir@"
+APR_BUILD_DIR="@apr_builddir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
APR_LIBNAME="@APR_LIBNAME@"
+# NOTE: the following line is modified during 'make install': alter with
care!
[EMAIL PROTECTED]@
+
show_usage()
{
cat << EOF
@@ -123,42 +127,10 @@
exit 1
fi
-thisdir="`dirname $0`"
-thisdir="`cd $thisdir && pwd`"
-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.
-REALPATH=
-if test -x "`which realpath 2>/dev/null`"; then
- 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`"
- fi
- if test -n "$tmpbindir"; then
- tmpbindir="`$REALPATH $tmpbindir`"
- fi
-fi
-if test "$tmpbindir" = "$thisdir"; then
- location=installed
-elif test "$APR_SOURCE_DIR" = "$thisdir"; then
- location=source
-else
- location=build
-fi
-
if test "$location" = "installed"; then
LA_FILE="$libdir/lib${APR_LIBNAME}.la"
else
- LA_FILE="$thisdir/lib${APR_LIBNAME}.la"
+ LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
fi
flags=""
@@ -190,7 +162,7 @@
flags="$APR_SOURCE_DIR/include"
else
# this is for VPATH builds
- flags="$thisdir/include $APR_SOURCE_DIR/include"
+ flags="$APR_BUILD_DIR/include $APR_SOURCE_DIR/include"
fi
echo $flags
exit 0
@@ -222,7 +194,7 @@
flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
else
# this is for VPATH builds
- flags="$flags -I$thisdir/include -I$APR_SOURCE_DIR/include
$EXTRA_INCLUDES"
+ flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include
$EXTRA_INCLUDES"
fi
;;
--srcdir)
@@ -236,7 +208,7 @@
echo "$APR_SOURCE_DIR/build"
else
# this is for VPATH builds
- echo "$thisdir/build"
+ echo "$APR_BUILD_DIR/build"
fi
exit 0
;;
@@ -249,7 +221,8 @@
### avoid using -L if libdir is a "standard" location like /usr/lib
flags="$flags -L$libdir -l${APR_LIBNAME}"
else
- flags="$flags -L$thisdir -l${APR_LIBNAME}"
+ ### this surely can't work since the library is in .libs?
+ flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
fi
;;
--link-libtool)
@@ -287,7 +260,7 @@
if test "$location" = "installed"; then
echo "${installbuilddir}/libtool"
else
- echo "$thisdir/libtool"
+ echo "$APR_BUILD_DIR/libtool"
fi
exit 0
;;
