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 d40f68041f370d7b6ff36c5879a0f6f99db84f44..90193ee47d0e063943bc2712409c6876145ce78c 100644 (file)
--- 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 7c857bdd24ba25aafd989f56679ea17b91f1eec4..b969dbd470fdd5b033fb8d9054cfd86a76fa8684 100755 (executable)
--- 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`"