Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 67222 invoked by uid 500); 5 Nov 2002 22:13:43 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 67192 invoked by uid 500); 5 Nov 2002 22:13:43 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 5 Nov 2002 22:13:42 -0000 Message-ID: <20021105221342.57467.qmail@icarus.apache.org> From: sussman@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/build find_apu.m4 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N sussman 2002/11/05 14:13:42 Modified: build find_apu.m4 Log: * find_apu.m4: backport a change from svn; favor in-tree over installed apu Revision Changes Path 1.7 +10 -20 apr-util/build/find_apu.m4 Index: find_apu.m4 =================================================================== RCS file: /home/cvs/apr-util/build/find_apu.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- find_apu.m4 16 May 2002 23:06:30 -0000 1.6 +++ find_apu.m4 5 Nov 2002 22:13:42 -0000 1.7 @@ -72,7 +72,16 @@ installed APU, nor an APR-util build directory.]) fi ],[ - if test -n "$3" && test "$3" = "1"; then + dnl if we have a bundled source directory, use it + if test -d "$1"; then + apu_found="reconfig" + if test -n "$2"; then + apu_config="$2/apu-config" + else + apu_config="$1/apu-config" + fi + fi + if test "$apu_found" = "no" && test -n "$3" && test "$3" = "1"; then if apu-config --help > /dev/null 2>&1 ; then apu_found="yes" apu_config="apu-config" @@ -85,25 +94,6 @@ break fi done - fi - fi - dnl if we have a bundled source directory, then we may have more work - if test -d "$1"; then - apu_temp_abs_srcdir="`cd $1 && pwd`" - if test "$apu_found" = "yes" \ - && test "`$apu_config --srcdir`" = "$apu_temp_abs_srcdir"; then - dnl the installed apu-config represents our source directory, so - dnl pretend we didn't see it and just use our bundled source - apu_found="no" - fi - dnl We could not find an apu-config; use the bundled one - if test "$apu_found" = "no"; then - apu_found="reconfig" - if test -n "$2"; then - apu_config="$2/apu-config" - else - apu_config="$1/apu-config" - fi fi fi ])