httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sander Temme <san...@temme.net>
Subject [PATCH] Have buildconf support out-of-tree APR and APU
Date Sun, 10 Apr 2005 22:11:46 GMT
Folks,

I would like to keep my checkout layout like so:

httpd/
	/trunk
apr/
	/apr
		/trunk
	/apr-util
		/trunk

So, I would like to call from the httpd checkout ./buildconf 
--with-apr=../../apr/apr/trunk --with-apr-util=../../apr/apr-util/trunk

The following patch should fully propagate these parameters:

Index: buildconf
===================================================================
--- buildconf	(revision 160800)
+++ buildconf	(working copy)
@@ -127,23 +127,19 @@

  cross_compile_warning="warning: AC_TRY_RUN called without default to 
allow cross compiling"

-if [ -d srclib/apr ]; then
-    echo rebuilding $apr_configure
-    (cd srclib/apr && ./buildconf) || {
-        echo "./buildconf failed for apr"
-        exit 1
-    }
-    rm -f srclib/apr/apr.spec
-fi
+echo rebuilding $apr_configure
+(cd ${apr_src_dir} && ./buildconf) || {
+    echo "./buildconf failed for apr"
+    exit 1
+}
+rm -f ${apr_src_dir}/apr.spec

-if [ -d srclib/apr-util ]; then
-    echo rebuilding $aprutil_configure
-    (cd srclib/apr-util && ./buildconf) || {
-        echo "./buildconf failed for apr-util"
-        exit 1
-    }
-    rm -f srclib/apr-util/apr-util.spec
-fi
+echo rebuilding $aprutil_configure
+(cd ${apu_src_dir} && ./buildconf --with-apr=${apr_src_dir}) || {
+    echo "./buildconf failed for apr-util"
+    exit 1
+}
+rm -f ${apu_src_dir}/apr-util.spec

  echo copying build files
  cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \

This allows buildconf to complete as invoked above. I basically 
propagate the ap{r,u}_src_dir variable through the script, and into 
${apu_src_dir}/buildconf. I'm also removing the directory checks, since 
they have been done before and the script has failed already if they 
don't exist.

Next up: hack the httpd configure script (or its input) to learn from 
buildconf about AP{R,U}. I'd like to post this first though to gather 
input.

Thoughts?

S.

-- 
sander@temme.net              http://www.temme.net/sander/
PGP FP: 51B4 8727 466A 0BC3 69F4  B7B8 B2BE BC40 1529 24AF
Mime
View raw message