apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr/build rules.mk.in
Date Fri, 15 Feb 2002 08:43:46 GMT
jerenkrantz    02/02/15 00:43:46

  Modified:    .        APRVARS.in CHANGES apr-config.in configure.in
               build    rules.mk.in
  Log:
  Add autoconf-2.52f+ support.  (It sets abs_builddir to be relative not
  absolute!)
  
  Submitted by:	Blair Zajac <blair@orcaware.com>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.12      +1 -1      apr/APRVARS.in
  
  Index: APRVARS.in
  ===================================================================
  RCS file: /home/cvs/apr/APRVARS.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- APRVARS.in	3 Dec 2001 18:00:04 -0000	1.11
  +++ APRVARS.in	15 Feb 2002 08:43:46 -0000	1.12
  @@ -8,7 +8,7 @@
   EXTRA_INCLUDES="@EXTRA_INCLUDES@"
   LIBTOOL_LIBS="@LIBTOOL_LIBS@"
   SHLIBPATH_VAR="@shlibpath_var@"
  -APR_SOURCE_DIR="@abs_srcdir@"
  +APR_SOURCE_DIR="@apr_srcdir@"
   APR_SO_EXT="@so_ext@"
   APR_LIB_TARGET="@export_lib_target@"
   
  
  
  
  1.222     +5 -2      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- CHANGES	13 Feb 2002 16:39:28 -0000	1.221
  +++ CHANGES	15 Feb 2002 08:43:46 -0000	1.222
  @@ -1,6 +1,9 @@
  -Changes with APR b1  
  +Changes with APR b1
   
  -  *) added new functions for atomic operations. These are experimental
  +  *) Enable autoconf 2.52{f,g} build support.
  +     [Blair Zajac <blair@orcaware.com>]
  +
  +  *) Added new functions for atomic operations. These are experimental
        at the moment, so use in apps is discouraged [Ian Holsman]
   
     *) Correct serious problems with the Win32 apr_file_dup2 
  
  
  
  1.11      +1 -1      apr/apr-config.in
  
  Index: apr-config.in
  ===================================================================
  RCS file: /home/cvs/apr/apr-config.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr-config.in	8 Feb 2002 21:03:25 -0000	1.10
  +++ apr-config.in	15 Feb 2002 08:43:46 -0000	1.11
  @@ -70,7 +70,7 @@
   LIBS="@EXTRA_LIBS@"
   EXTRA_INCLUDES="@EXTRA_INCLUDES@"
   SHLIBPATH_VAR="@shlibpath_var@"
  -APR_SOURCE_DIR="@abs_srcdir@"
  +APR_SOURCE_DIR="@apr_srcdir@"
   APR_SO_EXT="@so_ext@"
   APR_LIB_TARGET="@export_lib_target@"
   
  
  
  
  1.407     +11 -10    apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.406
  retrieving revision 1.407
  diff -u -r1.406 -r1.407
  --- configure.in	12 Feb 2002 21:51:30 -0000	1.406
  +++ configure.in	15 Feb 2002 08:43:46 -0000	1.407
  @@ -46,25 +46,26 @@
   APR_PRELOAD
   
   dnl Absolute source/build directory
  -abs_srcdir=`(cd $srcdir && pwd)`
  -abs_builddir=`pwd`
  +apr_srcdir=`(cd $srcdir && pwd)`
  +apr_builddir=`pwd`
  +AC_SUBST(apr_srcdir)
  +AC_SUBST(apr_builddir)
   
  -if test "$abs_builddir" != "$abs_srcdir"; then
  +if test "$apr_builddir" != "$apr_srcdir"; then
     USE_VPATH=1
   fi
   
   dnl Libtool might need this symbol -- it must point to the location of
   dnl the generated libtool script (not necessarily the "top" build dir).
   dnl
  -top_builddir="$abs_builddir"
  +top_builddir="$apr_builddir"
   AC_SUBST(top_builddir)
  -AC_SUBST(abs_srcdir)
   
   dnl Directory containing apr build macros, helpers, and make rules
   dnl NOTE: make rules (rules.mk) will be in the builddir for vpath
   dnl
  -apr_buildout=$abs_builddir/build
  -apr_builders=$abs_srcdir/build
  +apr_buildout=$apr_builddir/build
  +apr_builders=$apr_srcdir/build
   AC_SUBST(apr_builders)
   
   MKDIR=$apr_builders/mkdir.sh
  @@ -109,7 +110,7 @@
           LTFLAGS='--silent'
       fi
       dnl get libtool's setting of shlibpath_var
  -    eval `grep "^shlibpath_var=[[A-Z_]]\+$" $abs_builddir/libtool`
  +    eval `grep "^shlibpath_var=[[A-Z_]]\+$" $apr_builddir/libtool`
       ;;
   esac
   
  @@ -1564,8 +1565,8 @@
     for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do
       dir=`echo $makefile|sed 's%[^/][^/]*$%%'`
       (cat <<EOF
  -srcdir = $abs_srcdir/$dir
  -VPATH  = $abs_srcdir/$dir
  +srcdir = $apr_srcdir/$dir
  +VPATH  = $apr_srcdir/$dir
   
   EOF
   )    |  cat - $makefile | \
  
  
  
  1.22      +1 -1      apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- rules.mk.in	29 Oct 2001 12:47:13 -0000	1.21
  +++ rules.mk.in	15 Feb 2002 08:43:46 -0000	1.22
  @@ -61,7 +61,7 @@
   #
   # Configuration variables
   #
  -apr_builddir=@top_builddir@
  +apr_builddir=@apr_builddir@
   apr_builders=@apr_builders@
   
   CC=@CC@
  
  
  

Mime
View raw message