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 CHANGES apu-config.in configure.in
Date Tue, 16 Apr 2002 06:55:59 GMT
jerenkrantz    02/04/15 23:55:59

  Modified:    .        CHANGES apu-config.in configure.in
  Log:
  Fix apu-config --includes to properly handle cases when apr-util is
  installed.
  
  Place the source dir variables in APRUTIL_PRIV_INCLUDES rather than
  APRUTIL_INCLUDES so that APRUTIL_INCLUDES only contains external
  INCLUDES rather than our munged source includes (allows us to fix
  other part of --includes case).
  
  Revision  Changes    Path
  1.61      +2 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- CHANGES	29 Mar 2002 08:12:08 -0000	1.60
  +++ CHANGES	16 Apr 2002 06:55:59 -0000	1.61
  @@ -1,5 +1,7 @@
   Changes with APR-util b1  
   
  +  *) Fix exporting of includes in apu-config.  [Justin Erenkrantz]
  +
     *) Change bucket brigades API to allow a "bucket allocator" to be
        passed in at certain points.  This allows us to implement freelists
        so that we can stop using malloc/free so frequently.
  
  
  
  1.9       +9 -2      apr-util/apu-config.in
  
  Index: apu-config.in
  ===================================================================
  RCS file: /home/cvs/apr-util/apu-config.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apu-config.in	14 Mar 2002 02:19:07 -0000	1.8
  +++ apu-config.in	16 Apr 2002 06:55:59 -0000	1.9
  @@ -59,6 +59,7 @@
   exec_prefix="@exec_prefix@"
   bindir="@bindir@"
   libdir="@libdir@"
  +includedir="@includedir@"
   
   LIBS="@APRUTIL_EXPORT_LIBS@"
   INCLUDES="@APRUTIL_INCLUDES@"
  @@ -103,7 +104,7 @@
   tmpbindir="`cd $bindir && pwd`"
   if test "$tmpbindir" = "$thisdir"; then
     location=installed
  -elif test "$APR_SOURCE_DIR" = "$thisdir"; then
  +elif test "$APU_SOURCE_DIR" = "$thisdir"; then
     location=source
   else
     location=build
  @@ -142,7 +143,13 @@
       flags="$flags $LIBS"
       ;;
       --includes)
  -    flags="$flags $INCLUDES"
  +    if test "$location" = "installed"; then
  +        flags="$flags -I$includedir $INCLUDES"
  +    elif test "$location" = "source"; then
  +        flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
  +    else
  +        flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include $INCLUDES"
  +    fi
       ;;
       --ldflags)
       flags="$flags $LDFLAGS"
  
  
  
  1.47      +4 -6      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- configure.in	15 Feb 2002 02:23:00 -0000	1.46
  +++ configure.in	16 Apr 2002 06:55:59 -0000	1.47
  @@ -39,14 +39,11 @@
   dnl set up the compilation flags and stuff
   dnl
   
  -APRUTIL_INCLUDES="-I$top_builddir/include"
  -APRUTIL_PRIV_INCLUDES="-I$top_builddir/include/private"
  +APRUTIL_INCLUDES=""
  +APRUTIL_PRIV_INCLUDES="-I$top_builddir/include -I$top_builddir/include/private"
   if test -n "$USE_VPATH"; then
  -    APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES -I$abs_srcdir/include/private"
  -    APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I$abs_srcdir/include"
  +    APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES -I$abs_srcdir/include/private -I$abs_srcdir/include"
   fi
  -AC_SUBST(APRUTIL_INCLUDES)
  -AC_SUBST(APRUTIL_PRIV_INCLUDES)
   
   dnl
   dnl 1. Find the APR includes directory and (possibly) the source (base) dir.
  @@ -87,6 +84,7 @@
   APR_ADDTO(LIBS, [$APR_LIBS])
   
   AC_SUBST(APRUTIL_EXPORT_LIBS)
  +AC_SUBST(APRUTIL_PRIV_INCLUDES)
   AC_SUBST(APRUTIL_INCLUDES)
   AC_SUBST(APRUTIL_LDFLAGS)
   AC_SUBST(LDFLAGS)
  
  
  

Mime
View raw message