httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thom May <t...@planetarytramp.net>
Subject Re: [Patch] make buildconf work with out-of-tree apr and apu
Date Thu, 30 Jan 2003 11:25:28 GMT
* Thom May (thom@planetarytramp.net) wrote :
> * Justin Erenkrantz (jerenkrantz@apache.org) wrote :
> > --On Wednesday, January 29, 2003 23:55:29 +0000 Thom May 
> > <thom@planetarytramp.net> wrote:
> > 
> > >+if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ];
> > >then      echo ""
> > >-    echo "You don't have a srclib/apr/ subdirectory.  Please get one:"
> > >+    echo "You don't have a copy of the apr source.  Please get one:"
> > >     echo ""
> > >     echo "   cd srclib"
> > >     echo "   cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic
> > >login"
> > 
> > Ridiculously minor nit: we should print $apr_src_dir in the error message 
> > and/or mention use --with-apr in the help.  =)  -- justin
> 
> Agreed. :-)
New version attached.
As far as I'm aware, echo -n is POSIX; please beat me with a cluestick if
I'm wrong...
-Thom


Index: buildconf
===================================================================
RCS file: /home/cvspublic/httpd-2.0/buildconf,v
retrieving revision 1.29
diff -u -u -r1.29 buildconf
--- buildconf	8 Jan 2003 09:50:09 -0000	1.29
+++ buildconf	30 Jan 2003 11:09:37 -0000
@@ -56,12 +56,45 @@
 # buildconf: Build the support scripts needed to compile from a
 #            checked-out version of the source code.
 
+# set a couple of defaults for where we should be looking for our support libs.
+# can be overridden with --with-apr=[dir] and --with-apr-util=[dir]
+
+apr_src_dir=srclib/apr
+apu_src_dir=srclib/apr-util
+
+while test $# -gt 0 
+do
+  # Normalize
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case "$1" in
+  --with-apr=*)
+  apr_src_dir=$optarg
+  ;;
+  esac
+
+  case "$1" in
+  --with-apr-util=*)
+  apu_src_dir=$optarg
+  ;;
+  esac
+
+  shift
+done
+
 #
 # Check to be sure that we have the srclib dependencies checked-out
 #
-if [ ! -d srclib/apr -o ! -f srclib/apr/build/apr_common.m4 ]; then
+
+if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ]; then
     echo ""
-    echo "You don't have a srclib/apr/ subdirectory.  Please get one:"
+    echo "You don't have a copy of the apr source in $apr_src_dir. " 
+    echo "Please get the source using the following instructions," 
+    echo -n "or specify the location of the source with " 
+    echo "--with-apr=[path to apr] :"
     echo ""
     echo "   cd srclib"
     echo "   cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login"
@@ -70,9 +103,12 @@
     echo ""
     exit 1
 fi
-if [ ! -d srclib/apr-util -o ! -f srclib/apr-util/Makefile.in ]; then
+if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
     echo ""
-    echo "You don't have a srclib/apr-util/ subdirectory.  Please get one:"
+    echo "You don't have a copy of the apr-util source in $apu_src_dir. "
+    echo "Please get one the source using the following instructions, "
+    echo -n "or specify the location of the source with "
+    echo "--with-apr-util=[path to apr-util]:"
     echo ""
     echo "   cd srclib"
     echo "   cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login"
@@ -98,30 +134,36 @@
 #
 # end temporary stuff
 
-apr_configure="srclib/apr/configure"
-aprutil_configure="srclib/apr-util/configure"
+apr_configure="$apr_src_dir/configure"
+aprutil_configure="$apu_src_dir/configure"
 pcre_configure="srclib/pcre/configure"
 config_h_in="include/ap_config_auto.h.in"
 
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
 
-echo rebuilding $apr_configure
-(cd srclib/apr && ./buildconf) || {
-    echo "./buildconf failed for apr"
-    exit 1
-}
+if [ -d srclib/apr ]
+then
+    echo rebuilding $apr_configure
+    (cd srclib/apr && ./buildconf) || {
+        echo "./buildconf failed for apr"
+        exit 1
+    }
+fi
 
-echo rebuilding $aprutil_configure
-(cd srclib/apr-util && ./buildconf) || {
-    echo "./buildconf failed for apr-util" 
-    exit 1
-}
+if [ -d srclib/apr-util ]
+then
+    echo rebuilding $aprutil_configure
+    (cd srclib/apr-util && ./buildconf) || {
+        echo "./buildconf failed for apr-util" 
+        exit 1
+    }
+fi
 
 echo copying build files
-cp srclib/apr/build/config.guess build
-cp srclib/apr/build/config.sub build
-cp srclib/apr/build/PrintPath build
-
+cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \
+   $apr_src_dir/build/PrintPath $apr_src_dir/build/apr_common.m4 \
+   $apr_src_dir/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
+   
 # Optionally copy libtool-1.3.x files
 if [ -f srclib/apr/build/ltconfig ]; then
     cp srclib/apr/build/ltconfig build
Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.238
diff -u -u -r1.238 configure.in
--- configure.in	19 Dec 2002 05:28:16 -0000	1.238
+++ configure.in	30 Jan 2003 11:09:40 -0000
@@ -13,9 +13,9 @@
 dnl #
 dnl # Include our own M4 macros along with those for APR and libtool
 dnl #
-sinclude(srclib/apr/build/apr_common.m4)
-sinclude(srclib/apr/build/find_apr.m4)
-sinclude(srclib/apr-util/build/find_apu.m4)
+sinclude(build/apr_common.m4)
+sinclude(build/find_apr.m4)
+sinclude(build/find_apu.m4)
 sinclude(acinclude.m4)
 
 dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in

Mime
View raw message