summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-01-15 23:30:32 +0000
committerChris Larson <clarson@kergoth.com>2004-01-15 23:30:32 +0000
commit7e86a28238eac22bfdd136eebcb0286055999b1a (patch)
tree42a646d1523ccb3488635e8f0414a519af45f85d
parent4665bbc112171f0352d11479205ccb6eaf80a319 (diff)
Correct an intermittant apache 2.0.47 build failure.
BKrev: 40072298ujec-g245F5Cf3ZSxJBcuQ
-rw-r--r--apache/apache_2.0.47.oe13
-rw-r--r--apache/apache_2.0.48.oe13
2 files changed, 24 insertions, 2 deletions
diff --git a/apache/apache_2.0.47.oe b/apache/apache_2.0.47.oe
index f22988b62d..fa607b5c60 100644
--- a/apache/apache_2.0.47.oe
+++ b/apache/apache_2.0.47.oe
@@ -15,7 +15,18 @@ CFLAGS_prepend = "-I${STAGING_DIR}/target/include/openssl "
EXTRA_OECONF = --enable-ssl --with-ssl=${STAGING_DIR}/target --enable-dav --enable-dav-fs
do_configure () {
- ./buildconf
+ (cd srclib/apr && ./buildconf)
+ (cd srclib/apr-util && ./buildconf)
+
+ cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
+ srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
+ srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
+
+ (cd srclib/pcre && autoconf)
+
+ aclocal -I build
+ autoheader
+ autoconf
oe_runconf
}
diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe
index 2a3fe01f85..880d60c36f 100644
--- a/apache/apache_2.0.48.oe
+++ b/apache/apache_2.0.48.oe
@@ -17,7 +17,18 @@ EXTRA_OECONF = '--enable-ssl --with-ssl=${STAGING_DIR}/target \
--with-z=${STAGING_DIR}/target --with-dbm=db3'
do_configure () {
- ./buildconf
+ (cd srclib/apr && ./buildconf)
+ (cd srclib/apr-util && ./buildconf)
+
+ cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
+ srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
+ srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
+
+ (cd srclib/pcre && autoconf)
+
+ aclocal -I build
+ autoheader
+ autoconf
oe_runconf
}