apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Wed, 23 Jun 2004 13:05:03 GMT
jorton      2004/06/23 06:05:03

  Modified:    .        Makefile.in
               build    apu-conf.m4
  Log:
  Revert previous change (effectively) to fix VPATH build with in-tree
  apr and apr-util.
  
  * build/apu-conf.m4: Export APR srcdir again.
  
  * Makefile.in: Use APR srcdir for APR_BUILD_DIR.
  
  Revision  Changes    Path
  1.91      +3 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -d -w -u -r1.90 -r1.91
  --- Makefile.in	23 Jun 2004 12:07:28 -0000	1.90
  +++ Makefile.in	23 Jun 2004 13:05:02 -0000	1.91
  @@ -13,7 +13,9 @@
   INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
   APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
   APRUTIL_LIBS = @APRUTIL_LIBS@
  -APR_BUILD_DIR = @APR_BUILD_DIR@
  +
  +# see build/apu-conf.m4 for rationale.
  +APR_BUILD_DIR = @APR_SOURCE_DIR@/build
   
   TARGET_LIB = lib@APRUTIL_LIBNAME@.la
   INSTALL_SUBDIRS = @APR_XML_DIR@
  
  
  
  1.60      +5 -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.59
  retrieving revision 1.60
  diff -d -w -u -r1.59 -r1.60
  --- apu-conf.m4	23 Jun 2004 11:58:02 -0000	1.59
  +++ apu-conf.m4	23 Jun 2004 13:05:02 -0000	1.60
  @@ -27,6 +27,11 @@
     AC_SUBST(APR_INCLUDES)
     AC_SUBST(APR_LIBS)
     AC_SUBST(APR_BUILD_DIR)
  +
  +  dnl would be nice to obsolete this; gotcha is that apr_rules.mk resides
  +  dnl in a different directory to apr*.awk for a VPATH apr build.
  +  APR_SOURCE_DIR="`$apr_config --srcdir`"
  +  AC_SUBST(APR_SOURCE_DIR)
   ])
   
   
  
  
  

Mime
View raw message