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

1 files changed, 9 insertions, 5 deletions

diff --git a/buildconf b/buildconf
index 34f01e2c29..704606480a 100755
--- 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 \