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 Thu, 23 Jan 2003 08:47:08 GMT
jerenkrantz    2003/01/23 00:47:08

  Modified:    build    apu-conf.m4
  Log:
  Pass required options to expat so that expat is aware of how it at a minimum
  should be configured.
  (This is what httpd passes to apr-util in its configure.in)
  
  Otherwise, options like includedir are not sent to expat.  This results in
  headers in the wrong place.
  
  Revision  Changes    Path
  1.51      +2 -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.50
  retrieving revision 1.51
  diff -u -u -r1.50 -r1.51
  --- apu-conf.m4	21 Jan 2003 14:26:41 -0000	1.50
  +++ apu-conf.m4	23 Jan 2003 08:47:07 -0000	1.51
  @@ -629,7 +629,7 @@
   dnl special-case the bundled distribution (use absolute dirs)
   if test "$expat_include_dir" = "xml/expat/lib" -o "$expat_include_dir" = "xml/expat-cvs/lib";
then
     bundled_subdir="`echo $expat_include_dir | sed -e 's%/lib%%'`"
  -  APR_SUBDIR_CONFIG($bundled_subdir)
  +  APR_SUBDIR_CONFIG($bundled_subdir, "--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir")
     expat_include_dir=$top_builddir/$bundled_subdir/lib
     expat_ldflags="-L$top_builddir/$bundled_subdir/lib"
     expat_libs="-lexpat"
  @@ -641,7 +641,7 @@
     dnl This is a bit of a hack.  This only works because we know that
     dnl we are working with the bundled version of the software.
     bundled_subdir="xml/expat"
  -  APR_SUBDIR_CONFIG($bundled_subdir)
  +  APR_SUBDIR_CONFIG($bundled_subdir, "--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir")
     expat_include_dir=$top_builddir/$bundled_subdir/lib
     expat_ldflags="-L$top_builddir/$bundled_subdir/lib"
     expat_libs="-lexpat"
  
  
  

Mime
View raw message