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 Sun, 03 Feb 2002 15:19:20 GMT
jerenkrantz    02/02/03 07:19:20

  Modified:    .        CHANGES buildconf
               build    apu-conf.m4
  Log:
  - Remove the annoying autoconf 2.5x cache directory in buildconf
  
  - The expat detection was adding -I/usr/include to INCLUDES when a
    /usr/include/expat.h is found; this is redundant, can mess up include
    path ordering, and bleeding edge gcc's even give warnings for it.
  
  Submitted by:	Joe Orton <joe@manyfish.co.uk>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.55      +6 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- CHANGES	25 Jan 2002 21:19:54 -0000	1.54
  +++ CHANGES	3 Feb 2002 15:19:20 -0000	1.55
  @@ -1,5 +1,11 @@
   Changes with APR-util b1  
   
  +  *) Don't add /usr/include to the INCLUDES variable on expat's account.
  +     [Joe Orton <joe@manyfish.co.uk>]
  +
  +  *) Remove the autoconf 2.5x cache directory in buildconf.
  +     [Joe Orton <joe@manyfish.co.uk>]
  +
     *) BerkleyDB should NULL out the key if it is @EOF in vt_db_nextkey
        [Ian Holsman]
   
  
  
  
  1.5       +1 -1      apr-util/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr-util/buildconf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildconf	26 Dec 2001 20:45:45 -0000	1.4
  +++ buildconf	3 Feb 2002 15:19:20 -0000	1.5
  @@ -1,7 +1,7 @@
   #!/bin/sh
   
   # Remove aclocal.m4 as it'll break some builds...
  -rm -f aclocal.m4
  +rm -rf aclocal.m4 autom4te.cache
   
   #
   # Generate the autoconf header (include/apu_config.h) and ./configure
  
  
  
  1.30      +3 -1      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- apu-conf.m4	19 Jan 2002 05:03:57 -0000	1.29
  +++ apu-conf.m4	3 Feb 2002 15:19:20 -0000	1.30
  @@ -546,7 +546,9 @@
   AC_SUBST(APR_XML_SUBDIRS)
   AC_SUBST(APR_XML_DIR)
   
  -APR_ADDTO(APRUTIL_INCLUDES, [-I$expat_include_dir])
  +if test "$expat_include_dir" != "/usr/include"; then
  +  APR_ADDTO(APRUTIL_INCLUDES, [-I$expat_include_dir])
  +fi
   APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
   ])
   
  
  
  

Mime
View raw message