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.0.x@374909 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 93ff5e743b4021146567348ada7606769adc096b..84a29e7c9d09aaafd21b603c53f0771f41989a78 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,11 @@ Changes with Apache 2.0.56
      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]
+
   *) Avoid server-driven negotiation when a CGI script has emitted an 
      explicit "Status:" header. PR 38070.  [Nick Kew]
 

diff --git a/buildconf b/buildconf
index 0868723fdc6c10b772ef309606c30f13d87c1a07..6591fc0f2ac7d784b9dd83689f3e8d274e1cd96b 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -54,7 +54,7 @@ done
 
 should_exit=0
 
-if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ]; then
+if [ ! -f "$apr_src_dir/build/apr_common.m4" ]; then
     echo ""
     echo "You don't have a copy of the apr source in $apr_src_dir. " 
     echo "Please get the source using the following instructions," 
@@ -67,7 +67,7 @@ if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ]; then
     should_exit=1
 fi
 
-if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
+if [ ! -f "$apu_src_dir/Makefile.in" ]; then
     echo ""
     echo "You don't have a copy of the apr-util source in $apu_src_dir. "
     echo "Please get one the source using the following instructions, "
@@ -107,7 +107,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"
@@ -116,15 +116,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 f51a683eb330d5705fdcc88e216dd5ab63f870cb..2e3094c033cb2823b94d5886fffc6ec98cb989e2 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -60,8 +60,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