httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r374909 - in /httpd/httpd/branches/2.0.x: CHANGES buildconf server/Makefile.in
Date Sat, 04 Feb 2006 19:07:53 GMT
Author: wrowe
Date: Sat Feb  4 11:07:49 2006
New Revision: 374909

URL: http://svn.apache.org/viewcvs?rev=374909&view=rev
Log:
  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  


Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/buildconf
    httpd/httpd/branches/2.0.x/server/Makefile.in

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=374909&r1=374908&r2=374909&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Sat Feb  4 11:07:49 2006
@@ -14,6 +14,11 @@
      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]
 

Modified: httpd/httpd/branches/2.0.x/buildconf
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/buildconf?rev=374909&r1=374908&r2=374909&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/buildconf (original)
+++ httpd/httpd/branches/2.0.x/buildconf Sat Feb  4 11:07:49 2006
@@ -54,7 +54,7 @@
 
 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 @@
     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 @@
 
 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,14 +116,18 @@
     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 \

Modified: httpd/httpd/branches/2.0.x/server/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/Makefile.in?rev=374909&r1=374908&r2=374909&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/Makefile.in (original)
+++ httpd/httpd/branches/2.0.x/server/Makefile.in Sat Feb  4 11:07:49 2006
@@ -60,8 +60,7 @@
 	    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



Mime
View raw message