From: Philip M. Gollucci <pgollucci@apache.org>
Date: Fri, 11 Nov 2011 02:18:48 +0000 (+0000)
Subject: disable libapreq stuff until it works generically
X-Git-Tag: 2.5.0-alpha~7937
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d93987f17a9e298733d244c55ffd5885c21af8;p=thirdparty%2Fapache%2Fhttpd.git

disable libapreq stuff until it works generically

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200695 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/buildconf b/buildconf
index 56c375d9ba0..3d26e79df14 100755
--- a/buildconf
+++ b/buildconf
@@ -163,13 +163,13 @@ fi
 
 apr_src_dir=`cd $apr_src_dir && pwd` 
 
-apreq_configure="srclib/libapreq"
-echo
-echo rebuilding $apreq_configure
-(cd srclib/libapreq && ./buildconf --with-apr="$apr_src_dir") || {
-    echo "./buildconf failed for apreq"
-    exit 1
-}
+#apreq_configure="srclib/libapreq"
+#echo
+#echo rebuilding $apreq_configure
+#(cd srclib/libapreq && ./buildconf --with-apr="$apr_src_dir") || {
+#    echo "./buildconf failed for apreq"
+#    exit 1
+#}
 
 if [ $apr_major_version -lt 2 ] ; then
     if [ "$apu_src_dir" = "srclib/apr-util" ]; then
diff --git a/configure.in b/configure.in
index 437e6812e95..f95125ba17e 100644
--- a/configure.in
+++ b/configure.in
@@ -92,8 +92,10 @@ if test "$apr_found" = "reconfig"; then
                     [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
                     [--enable-layout=*|\'--enable-layout=*])
   dnl We must be the first to build and the last to be cleaned
-  AP_BUILD_SRCLIB_DIRS="apr libapreq $AP_BUILD_SRCLIB_DIRS"
-  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS libapreq apr"
+dnl  AP_BUILD_SRCLIB_DIRS="apr libapreq $AP_BUILD_SRCLIB_DIRS"
+dnl  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS libapreq apr"
+  AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
+  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
 
   dnl We have to find apr-N-config when we reconfigure APR.
   for majorver in 1 2; do
@@ -119,8 +121,9 @@ APR_VERSION=`$apr_config --version`
 apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
 APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
 
-echo $ac_n "${nl}Configuring Apache Request Library...${nl}"
-APR_SUBDIR_CONFIG(srclib/libapreq, [--with-apr=../apr/apr-2-config --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir])
+dnl echo $ac_n "${nl}Configuring Apache Request Library...${nl}"
+dnl APR_SUBDIR_CONFIG(srclib/libapreq, [--with-apr=../apr/apr-2-config --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir])
+dnl APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/srclib/libapreq/include])
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"