Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 79282 invoked from network); 17 Jan 2005 16:28:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Jan 2005 16:28:03 -0000 Received: (qmail 10654 invoked by uid 500); 17 Jan 2005 16:28:03 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 10626 invoked by uid 500); 17 Jan 2005 16:28:03 -0000 Mailing-List: contact commits-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 commits@apr.apache.org Received: (qmail 10603 invoked by uid 99); 17 Jan 2005 16:28:03 -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; Mon, 17 Jan 2005 08:28:02 -0800 Received: (qmail 79261 invoked by uid 65534); 17 Jan 2005 16:28:01 -0000 Date: 17 Jan 2005 16:28:01 -0000 Message-ID: <20050117162801.79259.qmail@minotaur.apache.org> From: minfrin@apache.org To: commits@apr.apache.org Subject: svn commit: r125425 - /apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: minfrin Date: Mon Jan 17 08:28:00 2005 New Revision: 125425 URL: http://svn.apache.org/viewcvs?view=rev&rev=125425 Log: Add option to specify the location of the expat library Modified: apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh Modified: apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh?view=diff&rev=125425&p1=apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh&r1=125424&p2=apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh&r2=125425 ============================================================================== --- apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh (original) +++ apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh Mon Jan 17 08:28:00 2005 @@ -24,6 +24,7 @@ apr_util_src_dir=. apr_src_dir=../apr +expat_dir=/usr while test $# -gt 0 do @@ -45,6 +46,12 @@ ;; esac + case "$1" in + --with-expat=*) + expat_dir=$optarg + ;; + esac + shift done @@ -52,18 +59,24 @@ cd $apr_util_src_dir else echo "The apr-util source could not be found within $apr_util_src_dir" - echo "Usage: buildpkg [--with-apr=dir] [--with-apr-util=dir]" + echo "Usage: buildpkg [--with-apr=dir] [--with-apr-util=dir] [--with-expat=dir]" exit 1 fi if [ ! -f "$apr_src_dir/configure.in" ]; then echo "The apr source could not be found within $apr_src_dir" - echo "Usage: buildpkg [--with-apr=dir] [--with-apr-util=dir]" + echo "Usage: buildpkg [--with-apr=dir] [--with-apr-util=dir] [--with-expat=dir]" + exit 1 +fi + +if [ ! -d "$expat_dir" ]; then + echo "The expat directory could not be found within $expat_dir" + echo "Usage: buildpkg [--with-apr=dir] [--with-apr-util=dir] [--with-expat=dir]" exit 1 fi ./configure --prefix=$PREFIX --with-apr=$apr_src_dir \ - --with-ldap + --with-ldap --with-expat=$expat_dir make make install DESTDIR=$TEMPDIR rm $TEMPDIR$PREFIX/lib/aprutil.exp