Uh, just resending this in case it dropped through the cracks. It'd be
nice if we could build apr-util with the installed version of apr,
rather than dipping our fingers into it's source tree for rules.mk.
-garrett
* buildconf: copy rules.mk from apr source tree.
* configure.in: use rules.mk in our tree instead of the one in apr's.
Index: buildconf
===================================================================
RCS file: /home/cvspublic/apr-util/buildconf,v
retrieving revision 1.7
diff -u -d -b -w -r1.7 buildconf
--- buildconf 22 Jan 2003 17:45:20 -0000 1.7
+++ buildconf 31 Jan 2003 03:20:05 -0000
@@ -38,7 +38,7 @@
build/config.guess build/config.sub
cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
$apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
- $apr_src_dir/build/config.sub build
+ $apr_src_dir/build/config.sub $apr_src_dir/build/rules.mk build
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr-util/configure.in,v
retrieving revision 1.60
diff -u -d -b -w -r1.60 configure.in
--- configure.in 22 Jan 2003 17:45:20 -0000 1.60
+++ configure.in 31 Jan 2003 03:20:05 -0000
@@ -134,13 +134,13 @@
*bsdi* | BSD/OS)
# Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then
- INCLUDE_RULES="include $APR_BUILD_DIR/build/rules.mk"
+ INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
else
- INCLUDE_RULES=".include \"$APR_BUILD_DIR/build/rules.mk\""
+ INCLUDE_RULES=".include \"$abs_srcdir/build/rules.mk\""
fi
;;
*)
- INCLUDE_RULES="include $APR_BUILD_DIR/build/rules.mk"
+ INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
;;
esac
AC_SUBST(INCLUDE_RULES)
