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 apr_common.m4 rules.mk.in
Date Mon, 19 Aug 2002 06:33:10 GMT
jerenkrantz    2002/08/18 23:33:10

  Modified:    .        CHANGES apr-config.in config.layout configure.in
               build    apr_common.m4 rules.mk.in
  Log:
  - Add parallel-apr layout which confines the 'parallel install' logic to a
    layout rather than unchangeable values.
  - Delay layout parsing until after we have setup the directory variables and
    determined our APR version.
  - Use ${libsuffix} instead of hardcoded -${APR_MAJOR_VERSION}.
  - Parse libsuffix in config.layout.
  - Add version info to rules.mk
  - Add APR_MAJOR_VERSION to apr-config.
  
  Revision  Changes    Path
  1.320     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.319
  retrieving revision 1.320
  diff -u -r1.319 -r1.320
  --- CHANGES	14 Aug 2002 17:15:15 -0000	1.319
  +++ CHANGES	19 Aug 2002 06:33:09 -0000	1.320
  @@ -1,5 +1,8 @@
   Changes with APR b1
   
  +  *) Add parallel-apr layout which utilizes the major version number in
  +     directories and library names.  [Justin Erenkrantz]
  +
     *) Add a version number to the library name (e.g. libapr-1.so) so
        that apps can do things like: -lapr-1 or -lapr-2, depending on
        which version they want to use and link against.
  
  
  
  1.22      +3 -1      apr/apr-config.in
  
  Index: apr-config.in
  ===================================================================
  RCS file: /home/cvs/apr/apr-config.in,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr-config.in	14 Aug 2002 17:15:15 -0000	1.21
  +++ apr-config.in	19 Aug 2002 06:33:09 -0000	1.22
  @@ -55,6 +55,9 @@
   # APR script designed to allow easy command line access to APR configuration
   # parameters.
   
  +APR_MAJOR_VERSION="@APR_MAJOR_VERSION@"
  +APR_DOTTED_VERSION="@APR_DOTTED_VERSION@"
  +
   prefix="@prefix@"
   exec_prefix="@exec_prefix@"
   bindir="@bindir@"
  @@ -75,7 +78,6 @@
   APR_SOURCE_DIR="@apr_srcdir@"
   APR_SO_EXT="@so_ext@"
   APR_LIB_TARGET="@export_lib_target@"
  -APR_DOTTED_VERSION="@APR_DOTTED_VERSION@"
   APR_LIBNAME="@APR_LIBNAME@"
   
   show_usage()
  
  
  
  1.2       +17 -0     apr/config.layout
  
  Index: config.layout
  ===================================================================
  RCS file: /home/cvs/apr/config.layout,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.layout	15 Aug 2002 19:58:34 -0000	1.1
  +++ config.layout	19 Aug 2002 06:33:09 -0000	1.2
  @@ -25,6 +25,23 @@
       localstatedir: ${prefix}
   </Layout>
   
  +#   Classical apr path layout designed for parallel installs.
  +<Layout parallel-apr>
  +    prefix:        /usr/local/apr
  +    exec_prefix:   ${prefix}
  +    bindir:        ${exec_prefix}/bin
  +    sbindir:       ${exec_prefix}/bin
  +    libdir:        ${exec_prefix}/lib/apr-${APR_MAJOR_VERSION}
  +    libexecdir:    ${exec_prefix}/modules
  +    mandir:        ${prefix}/man
  +    sysconfdir:    ${prefix}/conf
  +    datadir:       ${prefix}
  +    installbuilddir: ${datadir}/build
  +    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
  +    localstatedir: ${prefix}
  +    libsuffix:     -${APR_MAJOR_VERSION}
  +</Layout>
  +
   #   GNU standards conforming path layout.
   #   See FSF's GNU project `make-stds' document for details.
   <Layout GNU>
  
  
  
  1.478     +32 -30    apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.477
  retrieving revision 1.478
  diff -u -r1.477 -r1.478
  --- configure.in	15 Aug 2002 19:58:34 -0000	1.477
  +++ configure.in	19 Aug 2002 06:33:09 -0000	1.478
  @@ -36,24 +36,7 @@
   dnl # Some initial steps for configuration.  We setup the default directory
   dnl # and which files are to be configured.
   
  -dnl # First, we need to enable the layout handling code, then reparse the 
  -dnl # prefix-style arguments due to autoconf being a PITA.
  -APR_ENABLE_LAYOUT
  -APR_PARSE_ARGUMENTS
  -
  -dnl Set optional CC hints here in case autoconf makes an inappropriate choice.
  -dnl This allows us to suggest what the compiler should be, but still
  -dnl allows the user to override CC externally.
  -APR_CC_HINTS
  -
  -dnl Do the various CC checks *before* preloading values. The preload code
  -dnl may need to use compiler characteristics to make decisions. This macro
  -dnl can only be used once within a configure script, so this prevents a
  -dnl preload section from invoking the macro to get compiler info.
  -AC_PROG_CC
  -
  -dnl Preload
  -APR_PRELOAD
  +dnl Setup the directory macros now
   
   dnl Absolute source/build directory
   apr_srcdir=`(cd $srcdir && pwd)`
  @@ -83,6 +66,36 @@
   dnl Initialize mkdir -p functionality.
   APR_MKDIR_P_CHECK($apr_builders/mkdir.sh)
   
  +dnl get our version information
  +get_version="$apr_builders/get-version.sh"
  +version_hdr="$apr_srcdir/include/apr_version.h"
  +APR_MAJOR_VERSION="`$get_version major $version_hdr`"
  +APR_DOTTED_VERSION="`$get_version all $version_hdr`"
  +
  +AC_SUBST(APR_DOTTED_VERSION)
  +AC_SUBST(APR_MAJOR_VERSION)
  +
  +echo "APR Version: ${APR_DOTTED_VERSION}"
  +
  +dnl # Enable the layout handling code, then reparse the prefix-style
  +dnl # arguments due to autoconf being a PITA.
  +APR_ENABLE_LAYOUT
  +APR_PARSE_ARGUMENTS
  +
  +dnl Set optional CC hints here in case autoconf makes an inappropriate choice.
  +dnl This allows us to suggest what the compiler should be, but still
  +dnl allows the user to override CC externally.
  +APR_CC_HINTS
  +
  +dnl Do the various CC checks *before* preloading values. The preload code
  +dnl may need to use compiler characteristics to make decisions. This macro
  +dnl can only be used once within a configure script, so this prevents a
  +dnl preload section from invoking the macro to get compiler info.
  +AC_PROG_CC
  +
  +dnl Preload
  +APR_PRELOAD
  +
   dnl These added to allow default directories to be used...
   DEFAULT_OSDIR="unix"
   echo "(Default will be ${DEFAULT_OSDIR})"
  @@ -108,19 +121,8 @@
   
   APR_EBCDIC
   
  -dnl get our version information
  -get_version="$apr_builders/get-version.sh"
  -version_hdr="$apr_srcdir/include/apr_version.h"
  -APR_MAJOR_VERSION="`$get_version major $version_hdr`"
  -APR_DOTTED_VERSION="`$get_version all $version_hdr`"
  -
  -dnl this one will go into apr-config.in
  -AC_SUBST(APR_DOTTED_VERSION)
  -
  -echo "APR Version: ${APR_DOTTED_VERSION}"
  -
   dnl this is our library name
  -APR_LIBNAME="libapr-${APR_MAJOR_VERSION}"
  +APR_LIBNAME="libapr${libsuffix}"
   AC_SUBST(APR_LIBNAME)
   
   dnl prep libtool
  
  
  
  1.40      +1 -1      apr/build/apr_common.m4
  
  Index: apr_common.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_common.m4,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- apr_common.m4	15 Aug 2002 19:58:35 -0000	1.39
  +++ apr_common.m4	19 Aug 2002 06:33:10 -0000	1.40
  @@ -677,7 +677,7 @@
     for var in prefix exec_prefix bindir sbindir libexecdir mandir \
                sysconfdir datadir  \
                includedir localstatedir runtimedir logfiledir libdir \
  -             installbuilddir; do
  +             installbuilddir libsuffix; do
       eval "val=\"\$$var\""
       case $val in
         *+)
  
  
  
  1.25      +4 -0      apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- rules.mk.in	22 Apr 2002 01:24:49 -0000	1.24
  +++ rules.mk.in	19 Aug 2002 06:33:10 -0000	1.25
  @@ -64,6 +64,10 @@
   apr_builddir=@apr_builddir@
   apr_builders=@apr_builders@
   
  +# Some layouts require knowing what version we are at.
  +APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
  +APR_DOTTED_VERSION=@APR_DOTTED_VERSION@
  +
   CC=@CC@
   RM=@RM@
   AWK=@AWK@
  
  
  

Mime
View raw message