Commit d32113c7 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent 18173a44

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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.


































buildconf



+9
−5



























Changes for buildconf: 9 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -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 \


































server/Makefile.in



+1
−2



























Changes for server/Makefile.in: 1 added line, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -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