Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 8 Oct 2001 14:29:31 -0000
Message-ID: <20011008142931.56627.qmail@icarus.apache.org>
From: jim@apache.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src CHANGES Configuration.tmpl Configure

jim         01/10/08 07:29:31

  Modified:    src      CHANGES Configuration.tmpl Configure
  Log:
  Fix the EXPAT logic to the new meaning... Before, it was simply there to
  check that expat-lite existed, which was kind of bogus... Now, we
  allow it to choose which Expat we want. We prefer the system's Expat
  if available but will use expat-lite as a backup. We can also bypass
  that as well.
  
  Revision  Changes    Path
  1.1727    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1726
  retrieving revision 1.1727
  diff -u -r1.1726 -r1.1727
  --- CHANGES	2001/10/06 22:01:10	1.1726
  +++ CHANGES	2001/10/08 14:29:30	1.1727
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.22
   
  +  *) Change to the EXPAT rule logic. We can now use the system's expat
  +     library if we want, use our own expat-lite or have Configure
  +     pick one for us (prefer system, but use expat-lite as a backup).
  +     [Jim Jagielski, Greg Stein]
  +
     *) The manual directory is still configurable (as enabled by
        the 1.3.21 change), but its default setting was reverted to
        the pre-1.3.21 default as a subdirectory of the DocumentRoot.
  
  
  
  1.122     +6 -4      apache-1.3/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- Configuration.tmpl	1999/08/14 08:35:43	1.121
  +++ Configuration.tmpl	2001/10/08 14:29:30	1.122
  @@ -161,10 +161,12 @@
   #  actually print-out the code that the modules execute
   #
   # EXPAT:
  -#  Include James Clark's Expat package into Apache, for use by the
  -#  modules. The "default" is to include it if the lib/expat-lite/
  -#  directory is present. This rule will always be interpreted as "no"
  -#  if the directory is not present.
  +#  Apache requires an Expat package and includes James Clark's Expat
  +#  package (expat-lite) with the distribution. This determines
  +#  whether you want to include the system's Expat library ('yes'),
  +#  expat-lite ('no') or prefer the system Expat if available but choose
  +#  expat-lite if not ('default'). Note that if set to 'yes' and
  +#  libexpat.a cannot be found, the build will fail.
   #
   
   Rule SOCKS4=no
  
  
  
  1.439     +17 -23    apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.438
  retrieving revision 1.439
  diff -u -r1.438 -r1.439
  --- Configure	2001/10/08 13:59:39	1.438
  +++ Configure	2001/10/08 14:29:30	1.439
  @@ -1847,33 +1847,27 @@
   fi
   
   ####################################################################
  -## Add in the Expat library if needed/wanted.
  +## Add in the Expat library. Choose whether we want the system's
  +## version ('yes'), our version (expat-lite) ('no') or for Configure
  +## to choose for us ('default' - system is prefered if available).
   ##
   
  -# set the default, based on whether expat-lite is bundled. if it is present,
  -# then we can always include expat.
  -if [ "x$RULE_EXPAT" = "xdefault" ]; then
  -    if [ -d ./lib/expat-lite/ ]; then
  -        RULE_EXPAT=yes
  -    else
  -        RULE_EXPAT=no
  -    fi
  -fi
  -
  -if [ "x$RULE_EXPAT" = "xyes" ]; then
  -    if ./helpers/TestCompile lib expat; then
  +if ./helpers/TestCompile lib expat && [ "x$RULE_EXPAT" != "xno" ]; then
           echo " + using system Expat"
  -        LIBS="$LIBS -lexpat"
  -    else
  -        if [ ! -d ./lib/expat-lite/ ]; then
  -            echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
  -	    exit 1
  -        fi
  -        echo " + using builtin Expat"
  -        EXPATLIB="lib/expat-lite/libexpat.a"
  -        APLIBDIRS="expat-lite $APLIBDIRS"
  -        CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
  +	LIBS="$LIBS -lexpat"
  +else
  +    if [ "x$RULE_EXPAT" = "xyes" ]; then
  +        echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
  +        exit 1
  +    fi
  +    if [ ! -d ./lib/expat-lite/ ]; then
  +        echo "Bundled expat-lite package not available."
  +	exit 1
       fi
  +    echo " + using builtin Expat"
  +    EXPATLIB="lib/expat-lite/libexpat.a"
  +    APLIBDIRS="expat-lite $APLIBDIRS"
  +    CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
   fi
   
   ####################################################################