You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by mi...@apache.org on 2005/01/17 17:28:01 UTC

svn commit: r125425 - /apr/apr-util/branches/1.0.x/build/pkg/buildpkg.sh

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