Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 87310 invoked from network); 20 Mar 2005 05:26:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Mar 2005 05:26:29 -0000 Received: (qmail 40581 invoked by uid 500); 20 Mar 2005 05:26:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 40555 invoked by uid 500); 20 Mar 2005 05:26:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 40542 invoked by uid 99); 20 Mar 2005 05:26:27 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 19 Mar 2005 21:26:27 -0800 Received: (qmail 87259 invoked by uid 65534); 20 Mar 2005 05:26:26 -0000 Message-ID: <20050320052626.87258.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sun, 20 Mar 2005 05:26:26 -0000 Subject: svn commit: r158303 - httpd/httpd/trunk/buildconf To: cvs@httpd.apache.org From: pquerna@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Sat Mar 19 21:26:22 2005 New Revision: 158303 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D158303 Log: Test for APR and APR-Util one directory bellow httpd too. I like not havin= g to put them inside srclib. Modified: httpd/httpd/trunk/buildconf Modified: httpd/httpd/trunk/buildconf URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/buildconf?view=3Ddiff&= r1=3D158302&r2=3D158303 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/buildconf (original) +++ httpd/httpd/trunk/buildconf Sat Mar 19 21:26:22 2005 @@ -21,8 +21,8 @@ # set a couple of defaults for where we should be looking for our support = libs. # can be overridden with --with-apr=3D[dir] and --with-apr-util=3D[dir] =20 -apr_src_dir=3Dsrclib/apr -apu_src_dir=3Dsrclib/apr-util +apr_src_dir=3D"srclib/apr ../apr" +apu_src_dir=3D"srclib/apr-util ../apr-util" =20 while test $# -gt 0=20 do @@ -52,10 +52,22 @@ # =20 should_exit=3D0 +apr_found=3D0 +apu_found=3D0 =20 -if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ]; then +for dir in $apr_src_dir +do + if [ -d "${dir}" -a -f "${dir}/build/apr_common.m4" ]; then + echo "found apr source: ${dir}" + apr_src_dir=3D$dir + apr_found=3D1 + break + fi +done + +if [ $apr_found -lt 1 ]; then echo "" - echo "You don't have a copy of the apr source in $apr_src_dir. "=20 + echo "You don't have a copy of the apr source in srclib/apr. " echo "Please get the source using the following instructions,"=20 echo "or specify the location of the source with "=20 echo "--with-apr=3D[path to apr] :" @@ -64,9 +76,20 @@ echo "" should_exit=3D1 fi -if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then + +for dir in $apu_src_dir +do + if [ -d "${dir}" -a -f "${dir}/Makefile.in" ]; then + echo "found apr-util source: ${dir}" + apu_src_dir=3D$dir + apu_found=3D1 + break + fi +done + +if [ $apu_found -lt 1 ]; then echo "" - echo "You don't have a copy of the apr-util source in $apu_src_dir. " + echo "You don't have a copy of the apr-util source in srclib/apr-util.= " echo "Please get one the source using the following instructions, " echo "or specify the location of the source with " echo "--with-apr-util=3D[path to apr-util]:"