httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsanc...@apache.org
Subject cvs commit: httpd-2.0/server .cvsignore Makefile.in
Date Fri, 29 Nov 2002 11:05:59 GMT
wsanchez    2002/11/29 03:05:59

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES acinclude.m4
                        buildconf configure.in
               build    Tag: APACHE_2_0_BRANCH binbuild.sh
               modules/aaa Tag: APACHE_2_0_BRANCH config.m4
               modules/filters Tag: APACHE_2_0_BRANCH config.m4
               modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
               server   Tag: APACHE_2_0_BRANCH .cvsignore Makefile.in
  Added:       build    Tag: APACHE_2_0_BRANCH PrintPath config.guess
                        config.sub
  Log:
  Back-port changes to allow build without an in-tree apr and apr-util.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.2 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.1
  retrieving revision 1.988.2.2
  diff -u -r1.988.2.1 -r1.988.2.2
  --- CHANGES	25 Nov 2002 19:41:06 -0000	1.988.2.1
  +++ CHANGES	29 Nov 2002 11:05:56 -0000	1.988.2.2
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.44
   
  +  *) build: './configure && make' now works without an in-tree
  +     apr and apr-util. [Wilfredo Sanchez]
  +
     *) mod_negotiation: Set the appropriate mime response headers
        (Content-Type, charset, Content-Language and Content-Encoding)
        for negotated type-map "Body:" responses (such as the error
  
  
  
  1.133.2.1 +2 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.133
  retrieving revision 1.133.2.1
  diff -u -r1.133 -r1.133.2.1
  --- acinclude.m4	14 Nov 2002 14:17:03 -0000	1.133
  +++ acinclude.m4	29 Nov 2002 11:05:57 -0000	1.133.2.1
  @@ -88,7 +88,9 @@
     APACHE_SUBST(INSTALL_PROG_FLAGS)
     APACHE_SUBST(DSO_MODULES)
     APACHE_SUBST(APR_BINDIR)
  +  APACHE_SUBST(APR_INCLUDEDIR)
     APACHE_SUBST(APU_BINDIR)
  +  APACHE_SUBST(APU_INCLUDEDIR)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  
  
  
  1.27.2.1  +5 -0      httpd-2.0/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/buildconf,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- buildconf	2 Aug 2002 03:42:12 -0000	1.27
  +++ buildconf	29 Nov 2002 11:05:57 -0000	1.27.2.1
  @@ -117,6 +117,11 @@
       exit 1
   }
   
  +echo copying build files
  +cp srclib/apr/build/config.guess build
  +cp srclib/apr/build/config.sub build
  +cp srclib/apr/build/PrintPath build
  +
   echo rebuilding $pcre_configure
   (cd srclib/pcre && ${AUTOCONF:-autoconf})
   
  
  
  
  1.232.2.1 +5 -5      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.232
  retrieving revision 1.232.2.1
  diff -u -r1.232 -r1.232.2.1
  --- configure.in	14 Nov 2002 14:17:03 -0000	1.232
  +++ configure.in	29 Nov 2002 11:05:57 -0000	1.232.2.1
  @@ -8,14 +8,12 @@
   AC_INIT(ABOUT_APACHE)
   
   AC_CONFIG_HEADER(include/ap_config_auto.h)
  -AC_CONFIG_AUX_DIR(srclib/apr/build)
  +AC_CONFIG_AUX_DIR(build)
   
   dnl #
   dnl # Include our own M4 macros along with those for APR and libtool
   dnl #
   sinclude(srclib/apr/build/apr_common.m4)
  -sinclude(srclib/apr/build/apr_network.m4)
  -sinclude(srclib/apr/build/apr_threads.m4)
   sinclude(srclib/apr/build/find_apr.m4)
   sinclude(srclib/apr-util/build/find_apu.m4)
   sinclude(acinclude.m4)
  @@ -63,7 +61,7 @@
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
   
  -APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr")
  +APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1)
   
   if test "$apr_found" = "no"; then
     AC_MSG_ERROR([APR not found.  Please read the documentation.])
  @@ -82,10 +80,11 @@
   APR_ADDTO(INCLUDES, `$apr_config --includes`)
   SHLIBPATH_VAR=`$apr_config --shlib-path-var`
   APR_BINDIR=`$apr_config --bindir`
  +APR_INCLUDEDIR=`$apr_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
   
  -APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util")
  +APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1)
   
   if test "$apu_found" = "no"; then
     AC_MSG_ERROR([APR-util not found.  Please read the documentation.])
  @@ -101,6 +100,7 @@
   APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
   APR_ADDTO(INCLUDES, `$apu_config --includes`)
   APU_BINDIR=`$apu_config --bindir`
  +APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
   
   echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.40.2.1  +46 -37    httpd-2.0/build/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
  retrieving revision 1.40
  retrieving revision 1.40.2.1
  diff -u -r1.40 -r1.40.2.1
  --- binbuild.sh	12 Aug 2002 14:21:48 -0000	1.40
  +++ binbuild.sh	29 Nov 2002 11:05:57 -0000	1.40.2.1
  @@ -6,17 +6,25 @@
   # This script falls under the Apache License.
   # See http://www.apache.org/docs/LICENSE
   
  -OS=`./srclib/apr/build/config.guess`
  -BUILD_DIR="`pwd`/bindist"
  +OS=`./build/config.guess`
  +PRINTPATH="build/PrintPath"
  +APFULLDIR=`pwd`
  +BUILD_DIR="$APFULLDIR/bindist"
   DEFAULT_DIR="/usr/local/apache2"
  -APDIR=`pwd`
  +APDIR="$APFULLDIR"
   APDIR=`basename $APDIR`
  -APFULLDIR=`pwd`
   CONFIGPARAM="--enable-layout=Apache --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat
--enable-static-support"
  -VER=`echo $APDIR |sed s/httpd-//`
  -TAR="`srclib/apr/build/PrintPath tar`"
  -GTAR="`srclib/apr/build/PrintPath gtar`"
  -GZIP="`srclib/apr/build/PrintPath gzip`"
  +VER=`echo $APDIR | sed s/httpd-//`
  +TAR="`$PRINTPATH tar`"
  +GZIP="`$PRINTPATH gzip`"
  +COMPRESS="`$PRINTPATH compress`"
  +MD5="`$PRINTPATH md5`"
  +if [ x$MD5 = x ]; then
  +  OPENSSL="`$PRINTPATH openssl`"
  +  if [ x$OPENSSL != x ]; then
  +    MD5="$OPENSSL md5"
  +  fi
  +fi
   
   if [ x$1 != x ]; then
     USER=$1
  @@ -24,8 +32,7 @@
     USER="`build/buildinfo.sh -n %u@%h%d`"
   fi
   
  -if [ ! -f ./ABOUT_APACHE ]
  -then
  +if [ ! -f ./ABOUT_APACHE ]; then
     echo "ERROR: The current directory contains no valid Apache distribution."
     echo "Please change the directory to the top level directory of a freshly"
     echo "unpacked Apache 2.0 source distribution and re-execute the script"
  @@ -33,8 +40,7 @@
     exit 1;
   fi
   
  -if [ -d ./CVS ]
  -then
  +if [ -d ./CVS ]; then
     echo "ERROR: The current directory is a CVS checkout of Apache."
     echo "Only a standard Apache 2.0 source distribution should be used to"
     echo "create a binary distribution."
  @@ -60,8 +66,7 @@
     echo "[EOF]" \
   ) 2>&1 | tee build.log
   
  -if [ ! -f ./bindist/bin/httpd ]
  -then
  +if [ ! -f ./bindist/bin/httpd ]; then
     echo "ERROR: Failed to build Apache. See \"build.log\" for details."
     exit 1;
   fi
  @@ -144,41 +149,45 @@
   
   echo "Creating distribution archive and readme file..."
    
  -if [ ".`grep -i error build.log > /dev/null`" != . ]
  -then
  +if [ ".`grep -i error build.log > /dev/null`" != . ]; then
     echo "ERROR: Failed to build Apache. See \"build.log\" for details."
     exit 1;
   else
  -  if [ "x$GTAR" != "x" ]
  -  then
  -    $GTAR -zcf ../httpd-$VER-$OS.tar.gz -C .. httpd-$VER
  -  else
  -    if [ "x$TAR" != "x" ]
  -    then
  -      case "x$OS" in
  -        x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
  -	    *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
  -      esac
  -      if [ "x$GZIP" != "x" ]
  -      then
  -        $GZIP ../httpd-$VER-$OS.tar
  -      fi
  +  if [ "x$TAR" != "x" ]; then
  +    case "x$OS" in
  +      x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
  +      *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
  +    esac
  +    if [ "x$GZIP" != "x" ]; then
  +      $GZIP -9 ../httpd-$VER-$OS.tar
  +      ARCHIVE=../httpd-$VER-$OS.tar.gz
  +    elif [ "x$COMPRESS" != "x" ]; then
  +      $COMPRESS ../httpd-$VER-$OS.tar
  +      ARCHIVE=../httpd-$VER-$OS.tar.Z
       else
  -      echo "ERROR: Could not find a 'tar' program!"
  -      echo "       Please execute the following commands manually:"
  -      echo "         tar -cf ../httpd-$VER-$OS.tar ."
  -      echo "         gzip ../httpd-$VER-$OS.tar"
  +      echo "WARNING: Could not find a 'gzip' program!"
  +      echo "       tar archive is not compressed."
  +      ARCHIVE=../httpd-$VER-$OS.tar
       fi
  +  else
  +    echo "ERROR: Could not find a 'tar' program!"
  +    echo "       Please execute the following commands manually:"
  +    echo "         tar -cf ../httpd-$VER-$OS.tar ."
  +    echo "         gzip -9 ../httpd-$VER-$OS.tar"
  +  fi
  +
  +  if [ "x$MD5" != "x" ]; then
  +    $MD5 $ARCHIVE > $ARCHIVE.md5
     fi
   
  -  if [ -f ../httpd-$VER-$OS.tar.gz ] && [ -f ../httpd-$VER-$OS.README ]
  -  then
  +  if [ -f $ARCHIVE ] && [ -f ../httpd-$VER-$OS.README ]; then
       echo "Ready."
  -    echo "You can find the binary archive (httpd-$VER-$OS.tar.gz)"
  +    echo "You can find the binary archive ($ARCHIVE)"
       echo "and the readme file (httpd-$VER-$OS.README) in the"
       echo "parent directory."
       exit 0;
     else
  +    echo "ERROR: Archive or README is missing."
       exit 1;
     fi
   fi
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +0 -0      httpd-2.0/build/PrintPath
  
  Index: PrintPath
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/PrintPath,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  
  
  
  1.1.2.1   +0 -0      httpd-2.0/build/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/config.guess,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      httpd-2.0/build/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/config.sub,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.57.2.1  +1 -1      httpd-2.0/modules/aaa/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
  retrieving revision 1.57
  retrieving revision 1.57.2.1
  diff -u -r1.57 -r1.57.2.1
  --- config.m4	20 Sep 2002 00:57:49 -0000	1.57
  +++ config.m4	29 Nov 2002 11:05:58 -0000	1.57.2.1
  @@ -36,7 +36,7 @@
   APACHE_MODULE(auth_basic, basic authentication, , , yes)
   APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
     ap_old_cppflags=$CPPFLAGS
  -  CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
  +  CPPFLAGS="$CPPFLAGS $INCLUDES"
     AC_TRY_COMPILE([#include <apr.h>], [
   #if !APR_HAS_RANDOM 
   #error You need APR random support to use mod_auth_digest. 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1   +1 -1      httpd-2.0/modules/filters/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- config.m4	14 Nov 2002 20:22:49 -0000	1.9
  +++ config.m4	29 Nov 2002 11:05:58 -0000	1.9.2.1
  @@ -42,7 +42,7 @@
       if test "$ap_zlib_base" != "/usr"; then
         APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
         dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
  -      CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include"
  +      CPPFLAGS="$CPPFLAGS $INCLUDES"
         APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
         if test "x$ap_platform_runtime_link_flag" != "x"; then
            APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +1 -1      httpd-2.0/modules/mappers/config9.m4
  
  Index: config9.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/config9.m4,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- config9.m4	21 Aug 2002 19:47:15 -0000	1.12
  +++ config9.m4	29 Nov 2002 11:05:58 -0000	1.12.2.1
  @@ -23,7 +23,7 @@
   fi
   
   ap_old_cppflags=$CPPFLAGS
  -CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
  +CPPFLAGS="$CPPFLAGS $INCLUDES"
   AC_TRY_COMPILE([#include <apr.h>], [
   #if !APR_HAS_DSO
   #error You need APR DSO support to use mod_so. 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.1  +1 -0      httpd-2.0/server/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/.cvsignore,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- .cvsignore	5 Jun 2002 14:56:45 -0000	1.15
  +++ .cvsignore	29 Nov 2002 11:05:58 -0000	1.15.2.1
  @@ -5,6 +5,7 @@
   *.la
   test_char.h
   gen_test_char
  +export_files
   exports.c
   export_vars.h
   Debug
  
  
  
  1.75.2.1  +23 -17    httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.75
  retrieving revision 1.75.2.1
  diff -u -r1.75 -r1.75.2.1
  --- Makefile.in	8 Oct 2002 15:12:43 -0000	1.75
  +++ Makefile.in	29 Nov 2002 11:05:58 -0000	1.75.2.1
  @@ -2,7 +2,7 @@
   CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
   	ApacheCoreOS2.def
   DISTCLEAN_TARGETS = httpd.exp
  -EXTRACLEAN_TARGETS = exports.c export_vars.h
  +EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
   
   SUBDIRS = mpm
   
  @@ -30,28 +30,34 @@
   
   util.lo: test_char.h
   
  -EXPORT_FILES = $(top_srcdir)/include/*.h \
  -       $(top_srcdir)/os/$(OS_DIR)/*.h \
  -       $(top_srcdir)/srclib/apr/include/*.h \
  -       $(top_srcdir)/srclib/apr-util/include/*.h \
  -       $(top_srcdir)/modules/http/*.h
  +EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$OS_DIR $APR_INCLUDEDIR $APU_INCLUDEDIR
$(top_srcdir)/modules/http
   
  -delete-exports:
  +delete-exports: export_files
   	@if test -f exports.c; then \
  -		    headers="`find $(EXPORT_FILES) -newer exports.c`" ; \
  -		    if test -n "$$headers"; then \
  -		        echo Found newer headers. Will rebuild exports.c. ; \
  -		        echo rm -f exports.c ; \
  -		        rm -f exports.c ; \
  -		    fi \
  +	    files=`cat $<`; \
  +	    headers="`find $$files -newer exports.c`"; \
  +	    if test -n "$$headers"; then \
  +	        echo Found newer headers. Will rebuild exports.c.; \
  +	        echo rm -f exports.c; \
  +	        rm -f exports.c; \
  +	    fi; \
   	fi
   
  +export_files:
  +	tmp=export_files_unsorted.txt; \
  +	rm -f $$tmp && touch $$tmp; \
  +	for dir in $(EXPORT_DIRS); do \
  +	    find $$dir -maxdepth 1 -type f -name '*.h' >> $$tmp; \
  +	done; \
  +	cat $$tmp | sort | uniq > $@; \
  +	rm -f $$tmp
  +
   # full path required to keep BSD make happy
  -$(top_builddir)/server/exports.c:
  -	$(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@
  +$(top_builddir)/server/exports.c: export_files
  +	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $<` > $@
   
  -export_vars.h:
  -	$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@
  +export_vars.h: export_files
  +	$(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $<` > $@
   
   # wtf does this have to be explicit????
   exports.lo: exports.c
  
  
  

Mime
View raw message