Solaris build fixes; don't fail on missing .h files within

  a VPATH build, and don't test trees with -d (simply -f the
  expected files) in case a tree such as srclib/apr is actually
  a symlink rather than a true directory in ./buildconf.

Reviewed by: wrowe, rpluem, colm
Backports: 374821

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374907 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 79cebe577ee570e010561995d3caa0a2ee47dca8..ed5f59750dd0a5bc233cea1d7b2497d3bf855150 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,6 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
-  *) PR#38070: Avoid Server-driven negotiation when a script has
-     emitted an explicit Status: header.
-
-  *) Fix to avoid feeding C99 to C++ compilers [Joe Orton]
-
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)
      mod_ssl: Fix a possible crash during access control checks if a
      non-SSL request is processed for an SSL vhost (such as the
@@ -13,15 +8,25 @@ Changes with Apache 2.2.1
      ErrorDocument is configured, or if using "SSLEngine optional").
      PR 37791.  [Rüdiger Plüm, Joe Orton]
 
-  *) Chunk filter: Fix chunk filter to create correct chunks in the case that
-     a flush bucket is surrounded by data buckets. [Ruediger Pluem]
-
   *) SECURITY: CVE-2005-3352 (cve.mitre.org)
      mod_imagemap: Escape untrusted referer header before outputting
      in HTML to avoid potential cross-site scripting.  Change also
      made to ap_escape_html so we escape quotes.  Reported by JPCERT.
      [Mark Cox]
 
+  *) Modify apr[util] .h detection to avoid breakage on VPATH builds
+     using Solaris make (amoung others) and avoid breakage in ./buildconf
+     when srclib/apr[-util] are symlinks rather than directories proper.
+     [William Rowe]
+
+  *) PR#38070: Avoid Server-driven negotiation when a script has
+     emitted an explicit Status: header.
+
+  *) Fix to avoid feeding C99 to C++ compilers [Joe Orton]
+
+  *) Chunk filter: Fix chunk filter to create correct chunks in the case that
+     a flush bucket is surrounded by data buckets. [Ruediger Pluem]
+
   *) Fix syntax error in httpd.h with strict compilers.  PR 38740.
      [Per Olausson <pao darkheim.freeserve.co.uk>]
 

diff --git a/buildconf b/buildconf
index 34f01e2c29c707971ed0cb321b2fa900ceb29abf..704606480ac6a4b8d5c210db9b1d8861e5739175 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -58,7 +58,7 @@ apu_found=0
 
 for dir in $apr_src_dir
 do
-    if [ -d "${dir}" -a -f "${dir}/build/apr_common.m4" ]; then
+    if [ -f "${dir}/build/apr_common.m4" ]; then
         echo "found apr source: ${dir}"
         apr_src_dir=$dir
         apr_found=1
@@ -80,7 +80,7 @@ fi
 
 for dir in $apu_src_dir
 do
-    if [ -d "${dir}" -a -f "${dir}/Makefile.in" ]; then
+    if [ -f "${dir}/Makefile.in" ]; then
         echo "found apr-util source: ${dir}"
         apu_src_dir=$dir
         apu_found=1
@@ -128,7 +128,7 @@ config_h_in="include/ap_config_auto.h.in"
 
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
 
-if [ -d srclib/apr ]; then
+if [ "$apr_src_dir" = "srclib/apr" ]; then
     echo rebuilding $apr_configure
     (cd srclib/apr && ./buildconf) || {
         echo "./buildconf failed for apr"
@@ -137,15 +137,19 @@ if [ -d srclib/apr ]; then
     rm -f srclib/apr/apr.spec
 fi
 
-if [ -d srclib/apr-util ]; then
+apr_src_dir=`cd $apr_src_dir && pwd` 
+
+if [ "$apu_src_dir" = "srclib/apr-util" ]; then
     echo rebuilding $aprutil_configure
-    (cd srclib/apr-util && ./buildconf) || {
+    (cd srclib/apr-util && ./buildconf --with-apr=$apr_src_dir) || {
         echo "./buildconf failed for apr-util" 
         exit 1
     }
     rm -f srclib/apr-util/apr-util.spec
 fi
 
+apu_src_dir=`cd $apu_src_dir && pwd` 
+
 echo copying build files
 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 \

diff --git a/server/Makefile.in b/server/Makefile.in
index 8efcb419d4047f30c4189b0d18a431d153fc00c0..37e6956ed2678e72ccb033eb0b6d758842dc02f6 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -59,8 +59,7 @@ export_files:
            ls $$dir/*.h >> $$tmp; \
        done; \
        for dir in $(EXPORT_DIRS_APR); do \
-           ls $$dir/ap[ru].h >> $$tmp; \
-           ls $$dir/ap[ru]_*.h >> $$tmp; \
+           (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
        done; \
        sort -u $$tmp > $@; \
        rm -f $$tmp