Hi,
Here is my attempt to unbreak the apr-util build, so that
apr 0.9.2 can be released.
If you don't like what I've done to buildconf,
then the other solution is to copy
apr_common.m4, find_apr.m4, install.sh, config.guess, and config.sub
from the apr repository to the apr-util repository and
keep patch2.diff.
Comments?
--
Craig Rodrigues
http://home.attbi.com/~rodrigc
[EMAIL PROTECTED]
Index: buildconf
===================================================================
RCS file: /home/cvspublic/apr-util/buildconf,v
retrieving revision 1.6
diff -u -r1.6 buildconf
--- buildconf 15 May 2002 16:51:52 -0000 1.6
+++ buildconf 19 Jan 2003 08:24:35 -0000
@@ -1,5 +1,35 @@
#!/bin/sh
+#
+# Check command-line arguments for: --with-apr=[directory]
+# which specifies the root directory of apr source code.
+#
+while test $# -ne 0
+do
+ apr_src_dir=`expr "x$1" : 'x\-\-with-apr=\(.*\)'`
+ shift
+done
+
+if test -z "$apr_src_dir"
+then
+ echo ""
+ echo " --with-apr=[directory] not specified for apr source"
+ echo ""
+ exit 1
+else
+ echo ""
+ echo "Looking for apr source in $apr_src_dir"
+fi
+
+# Remove some files copied from apr source tree
+rm -rf build/apr_common.m4 build/find_apr.m4 build/install.sh
+rm -rf build/config.guess build/config.sub
+cp $apr_src_dir/build/apr_common.m4 build
+cp $apr_src_dir/build/find_apr.m4 build
+cp $apr_src_dir/build/install.sh build
+cp $apr_src_dir/build/config.guess build
+cp $apr_src_dir/build/config.sub build
+
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
@@ -8,6 +38,7 @@
#
echo "Creating include/private/apu_config.h ..."
${AUTOHEADER:-autoheader}
+
echo "Creating configure ..."
### do some work to toss config.cache?
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr-util/configure.in,v
retrieving revision 1.59
diff -u -r1.59 configure.in
--- configure.in 28 Nov 2002 21:17:47 -0000 1.59
+++ configure.in 19 Jan 2003 08:18:47 -0000
@@ -6,13 +6,13 @@
AC_INIT(export_vars.sh.in)
AC_CONFIG_HEADER(include/private/apu_config.h)
-AC_CONFIG_AUX_DIR(../apr/build)
+AC_CONFIG_AUX_DIR(build)
sinclude(build/apu-conf.m4)
sinclude(build/apu-iconv.m4)
sinclude(build/apu-hints.m4)
-sinclude(../apr/build/apr_common.m4)
-sinclude(../apr/build/find_apr.m4)
+sinclude(build/apr_common.m4)
+sinclude(build/find_apr.m4)
dnl Generate ./config.nice for reproducing runs of configure
dnl
