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 Wed, 05 Mar 2003 22:44:39 GMT
jerenkrantz    2003/03/05 14:44:39

  Modified:    .        configure.in
               build    apu-conf.m4
  Log:
  Stop stupid sed tricks with APR_BUILD_DIR and use --installbuilddir option
  to apr-config to get the build dir location.
  
  (We now respect the --installbuilddir option to APR if isn't build/.)
  
  Revision  Changes    Path
  1.64      +2 -2      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -u -r1.63 -r1.64
  --- configure.in	4 Feb 2003 21:03:38 -0000	1.63
  +++ configure.in	5 Mar 2003 22:44:39 -0000	1.64
  @@ -102,7 +102,7 @@
       dnl ### apr and expat libraries to the build or it'll die a truly horrible
       dnl ### death. We now use the apr-config tool to determine the correct
       dnl ### library to link against :)
  -    aprlib=`$APR_BUILD_DIR/apr-config --link-libtool`
  +    aprlib=`$apr_config --link-libtool`
       EXTRA_OS_LINK="$aprlib $top_builddir/xml/expat/lib/libexpat.la"
       ;;
   *AIX*|*Darwin*)
  @@ -128,7 +128,7 @@
   AC_SUBST(LDFLAGS)
   
   dnl copy apr's rules.mk into our build directory.
  -cp $APR_BUILD_DIR/build/apr_rules.mk $abs_srcdir/build/rules.mk
  +cp $APR_BUILD_DIR/apr_rules.mk $abs_srcdir/build/rules.mk
   
   dnl
   dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  
  
  
  1.53      +1 -3      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -u -r1.52 -r1.53
  --- apu-conf.m4	15 Feb 2003 17:57:12 -0000	1.52
  +++ apu-conf.m4	5 Mar 2003 22:44:39 -0000	1.53
  @@ -13,9 +13,7 @@
       AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
     fi
   
  -  changequote(<<,>>)dnl
  -  APR_BUILD_DIR="`echo $apr_config | sed 's,/[^/]*$,,'`"
  -  changequote([,])dnl
  +  APR_BUILD_DIR="`$apr_config --installbuilddir`"
   
     dnl make APR_BUILD_DIR an absolute directory (we'll need it in the
     dnl sub-projects in some cases)
  
  
  

Mime
View raw message