Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 1 Mar 2002 05:50:27 -0000
Message-ID: <20020301055027.11268.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: apr-util-cvs@apache.org
Subject: cvs commit: apr-util/build apu-conf.m4

jerenkrantz    02/02/28 21:50:27

  Modified:    .        CHANGES
               build    apu-conf.m4
  Log:
  Add detection of the FreeBSD ports textproc/expat and textproc/expat2.
  
  PR: 9955
  
  Revision  Changes    Path
  1.57      +3 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- CHANGES	4 Feb 2002 20:07:08 -0000	1.56
  +++ CHANGES	1 Mar 2002 05:50:27 -0000	1.57
  @@ -1,5 +1,8 @@
   Changes with APR-util b1  
   
  +  *) Add detection support for FreeBSD's expat and expat2 ports.
  +     [Justin Erenkrantz]
  +
     *) Deprecate check_brigade_flush(), which had several nasty bugs, and
        which was causing apr_brigade_write()'s logic to be less than obvious.
        Everything is now done in a slightly rearranged apr_brigade_write().
  
  
  
  1.36      +15 -2     apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- apu-conf.m4	8 Feb 2002 20:27:53 -0000	1.35
  +++ apu-conf.m4	1 Mar 2002 05:50:27 -0000	1.36
  @@ -437,10 +437,17 @@
       dnl Expat 1.95.* distribution
       expat_include_dir="$1/lib"
       expat_libs="$1/lib/libexpat.la"
  -  elif test -r "$1/include/expat.h"; then
  -    dnl Expat 1.95.* installation
  +  elif test -r "$1/include/expat.h" -a \
  +    -r "$1/lib/libexpat.la"; then
  +    dnl Expat 1.95.* installation (with libtool)
       expat_include_dir="$1/include"
       expat_libs="$1/lib/libexpat.la"
  +  elif test -r "$1/include/expat.h" -a \
  +    -r "$1/lib/libexpat.a"; then
  +    dnl Expat 1.95.* installation (without libtool)
  +    dnl FreeBSD textproc/expat2
  +    expat_include_dir="$1/include"
  +    expat_libs="-L$1/lib -lexpat"
     elif test -r "$1/xmlparse.h"; then
       dnl maybe an expat-lite. use this dir for both includes and libs
       expat_include_dir="$1"
  @@ -462,6 +469,12 @@
       dnl Debian distribution
       expat_include_dir="$1/include/xmltok"
       expat_libs="-L$1/lib -lxmlparse -lxmltok"
  +    expat_old=yes
  +  elif test -r "$1/include/xml/xmlparse.h" -a \
  +       -r "$1/lib/libexpat.a"; then
  +    dnl FreeBSD textproc/expat package
  +    expat_include_dir="$1/include/xml"
  +    expat_libs="-L$1/lib -lexpat"
       expat_old=yes
     elif test -r "$1/xmlparse/xmlparse.h"; then
       dnl Expat 1.0 or 1.1 source directory