jerenkrantz 2003/06/12 00:27:10
Modified: . CHANGES configure.in
Log:
Fix an oops in that apr-util would copy APR's apr_rules.mk into the source
directory rather than the build directory. This lead to some rather
unfortunate things if you tried to use VPATH multiple times.
Revision Changes Path
1.114 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -u -r1.113 -r1.114
--- CHANGES 28 May 2003 04:45:46 -0000 1.113
+++ CHANGES 12 Jun 2003 07:27:10 -0000 1.114
@@ -1,5 +1,8 @@
Changes with APR-util 0.9.4
+ *) Fix a problem with VPATH builds copying the APR rules.mk into the
+ source directory rather than the build directory. [Justin Erenkrantz]
+
*) SECURITY [httpd incident CAN-2003-0189] Address a thread safety
issue with apr_password_validate() on AIX, Linux, Mac OS X, and
possibly other platforms. [Jeff Trawick, Justin Erenkrantz]
1.68 +7 -4 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -u -r1.67 -r1.68
--- configure.in 11 Jun 2003 15:10:45 -0000 1.67
+++ configure.in 12 Jun 2003 07:27:10 -0000 1.68
@@ -156,7 +156,10 @@
AC_SUBST(LDFLAGS)
dnl copy apr's rules.mk into our build directory.
-cp $APR_BUILD_DIR/apr_rules.mk $abs_srcdir/build/rules.mk
+if test ! -d ./build; then
+ $mkdir_p build
+fi
+cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
dnl
dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
@@ -165,13 +168,13 @@
*bsdi* | BSD/OS)
# Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then
- INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
+ INCLUDE_RULES="include $abs_builddir/build/rules.mk"
else
- INCLUDE_RULES=".include \"$abs_srcdir/build/rules.mk\""
+ INCLUDE_RULES=".include \"$abs_builddir/build/rules.mk\""
fi
;;
*)
- INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
+ INCLUDE_RULES="include $abs_builddir/build/rules.mk"
;;
esac
AC_SUBST(INCLUDE_RULES)
