On Sun, Jan 19, 2003 at 12:33:10AM -0800, Justin Erenkrantz wrote: > These shouldn't be directories, so -r shouldn't be needed.
Then why does this line exist? rm -rf aclocal.m4 autom4te*.cache Anyways, I've incorporated your suggestions. -- 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 09:19:59 -0000 @@ -1,5 +1,45 @@ #!/bin/sh +# Default place to look for apr source. Can be overridden with +# --with-apr=[directory] +apr_src_dir=../apr + +while test $# -gt 0 +do + # Normalize + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case "$1" in + --with-apr=*) + apr_src_dir=$optarg + ;; + esac + + shift +done + +if test -d "$apr_src_dir" +then + echo "" + echo "Looking for apr source in $apr_src_dir" +else + echo "" + echo "Problem finding apr source in $apr_src_dir." + echo "Use:" + echo " --with-apr=[directory]" + exit 1 +fi + +# Remove some files, then copy them from apr source tree +rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \ + 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 + # 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.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
