Solaris build proposal; 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.

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

diff --git a/CHANGES b/CHANGES
index d8e7575f84d9404651a74ad9d34d2873c469a84c..e122649fe934714d9a023a169f41365f489e39d9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) 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]
+
   *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]
 
   *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.

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 a4da96f5484094eb163b3779b6bb2e0f2d0fb358..36c72f972385618855dbe2abf33c183946b143b4 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