From: Jeff Trawick <trawick@apache.org>
Date: Sat, 2 Feb 2002 20:30:03 +0000 (+0000)
Subject: binbuild.sh: Make sure that we use the expat from our source
X-Git-Tag: 2.0.32~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c51d3c9d0a062c17493dd2449413ed733a8f6e6;p=apache

binbuild.sh: Make sure that we use the expat from our source
tree so that there aren't any surprises on the target machine.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93184 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index d40f68041f..90193ee47d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.32-dev
 
+  *) binbuild.sh: Make sure that we use the expat from our source
+     tree so that there aren't any surprises on the target machine.
+     [Jeff Trawick]
+
   *) mod_cgid: Add retry logic for when the daemon can't fork fast
      enough to keep up with new requests.  Start using 
      HTTP_SERVER_UNAVAILABLE instead of HTTP_INTERNAL_SERVER_ERROR
diff --git a/build/binbuild.sh b/build/binbuild.sh
index 7c857bdd24..b969dbd470 100755
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -9,9 +9,10 @@
 OS=`./srclib/apr/build/config.guess`
 BUILD_DIR="`pwd`/bindist"
 DEFAULT_DIR="/usr/local/apache2"
-CONFIGPARAM="--with-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most"
 APDIR=`pwd`
 APDIR=`basename $APDIR`
+APFULLDIR=`pwd`
+CONFIGPARAM="--with-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat"
 VER=`echo $APDIR |sed s/httpd-//`
 TAR="`srclib/apr/build/PrintPath tar`"
 GTAR="`srclib/apr/build/PrintPath gtar`"