apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Tue, 16 Jul 2002 18:18:42 GMT
jerenkrantz    2002/07/16 11:18:42

  Modified:    .        CHANGES
               build    apu-conf.m4
  Log:
  Find installed expat on 64-bit platforms.
  
  /usr/lib64 is the libdir on AMD x86_64 and other 64 bit platforms where 32-bit
  and 64-bit libs can be installed side by side.
  
  [Minor tweaks by Justin]
  
  Submitted by:	Peter Poeml <poeml@suse.de>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.69      +2 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- CHANGES	29 Jun 2002 22:39:42 -0000	1.68
  +++ CHANGES	16 Jul 2002 18:18:41 -0000	1.69
  @@ -1,5 +1,7 @@
   Changes with APR-util b1  
   
  +  *) Look for expat in lib64 directories.  [Peter Poeml <poeml@suse.de>]
  +
     *) Faster implementation of apr_brigade_puts()  [Brian Pane]
   
     *) Fixed a segfault in apr_date_parse_rfc() for some date formats
  
  
  
  1.43      +7 -0      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- apu-conf.m4	14 May 2002 09:14:39 -0000	1.42
  +++ apu-conf.m4	16 Jul 2002 18:18:41 -0000	1.43
  @@ -414,6 +414,13 @@
       expat_libs="-lexpat"
       expat_libtool="$1/lib/libexpat.la"
     elif test -r "$1/include/expat.h" -a \
  +    -r "$1/lib64/libexpat.la"; then
  +    dnl Expat 1.95.* installation on certain 64-bit platforms (with libtool)
  +    expat_include_dir="$1/include"
  +    expat_ldflags="-L$1/lib64"
  +    expat_libs="-lexpat"
  +    expat_libtool="$1/lib64/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
  
  
  

Mime
View raw message