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/test Makefile.in
Date Tue, 10 Sep 2002 10:10:51 GMT
jerenkrantz    2002/09/10 03:10:51

  Modified:    .        CHANGES Makefile.in apu-config.in configure.in
               misc     Makefile.in
               test     Makefile.in
  Added:       .        config.layout
               build    get-version.sh
               include  apu_version.h
               misc     apu_version.c
  Log:
  - Add all of the standard versioning infrastructure bits derived from APR.
  - Add layout support.
  - Call it 0.9.1 to sync up with APR.  (They don't *have* to be in sync...)
  
  Revision  Changes    Path
  1.77      +4 -1      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -u -r1.76 -r1.77
  --- CHANGES	5 Sep 2002 05:31:19 -0000	1.76
  +++ CHANGES	10 Sep 2002 10:10:50 -0000	1.77
  @@ -1,4 +1,7 @@
  -Changes with APR-util b1  
  +Changes with APR-util 0.9.1
  +
  +  *) Add versioning infrastructure.
  +     [Justin Erenkrantz]
   
     *) Running "make check" in the toplevel directory or the test/ directory
        will build and run all test programs.  [Aaron Bannert]
  
  
  
  1.75      +5 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -u -r1.74 -r1.75
  --- Makefile.in	5 Sep 2002 05:31:19 -0000	1.74
  +++ Makefile.in	10 Sep 2002 10:10:50 -0000	1.75
  @@ -3,6 +3,10 @@
   #
   CPP = @CPP@
   
  +# gets substituted into some targets
  +APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
  +APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
  +
   srcdir = @srcdir@
   VPATH = @srcdir@
   
  @@ -10,7 +14,7 @@
   APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
   APRUTIL_LIBS = @APRUTIL_LIBS@
   
  -TARGET_LIB = libaprutil.la
  +TARGET_LIB = lib@APRUTIL_LIBNAME@.la
   INSTALL_SUBDIRS = @APR_XML_DIR@
   
   TARGETS = delete-lib $(TARGET_LIB) delete-exports aprutil.exp export_vars.h
  
  
  
  1.14      +9 -4      apr-util/apu-config.in
  
  Index: apu-config.in
  ===================================================================
  RCS file: /home/cvs/apr-util/apu-config.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- apu-config.in	14 May 2002 08:07:36 -0000	1.13
  +++ apu-config.in	10 Sep 2002 10:10:50 -0000	1.14
  @@ -55,6 +55,9 @@
   # APR-util script designed to allow easy command line access to APR-util
   # configuration parameters.
   
  +APRUTIL_MAJOR_VERSION="@APRUTIL_MAJOR_VERSION@"
  +APRUTIL_DOTTED_VERSION="@APRUTIL_DOTTED_VERSION@"
  +
   prefix="@prefix@"
   exec_prefix="@exec_prefix@"
   bindir="@bindir@"
  @@ -65,6 +68,8 @@
   INCLUDES="@APRUTIL_INCLUDES@"
   LDFLAGS="@APRUTIL_LDFLAGS@"
   
  +APRUTIL_LIBNAME="lib@APRUTIL_LIBNAME@.la"
  +
   APU_SOURCE_DIR="@top_srcdir@"
   APU_BUILD_DIR="@top_builddir@"
   APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@"
  @@ -117,9 +122,9 @@
   fi
   
   if test "$location" = "installed"; then
  -    LA_FILE="$libdir/libaprutil.la"
  +    LA_FILE="$libdir/$APRUTIL_LIBNAME"
   else
  -    LA_FILE="$thisdir/libaprutil.la"
  +    LA_FILE="$thisdir/$APRUTIL_LIBNAME"
   fi
   
   flags=""
  @@ -169,7 +174,7 @@
           ### avoid using -L if libdir is a "standard" location like /usr/lib
           flags="$flags -L$libdir -laprutil"
       else
  -        flags="$flags -L$thisdir -laprutil"
  +        flags="$flags -L$thisdir -l@APRUTIL_LIBNAME@"
       fi
       ;;
       --link-libtool)
  @@ -181,7 +186,7 @@
           flags="$flags $LA_FILE"
       elif test "$location" = "installed"; then
           ### avoid using -L if libdir is a "standard" location like /usr/lib
  -        flags="$flags -L$libdir -laprutil"
  +        flags="$flags -L$libdir -l@APRUTIL_LIBNAME@"
       else
           flags="$flags $LA_FILE"
       fi
  
  
  
  1.56      +19 -0     apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -u -r1.55 -r1.56
  --- configure.in	1 Aug 2002 12:14:43 -0000	1.55
  +++ configure.in	10 Sep 2002 10:10:50 -0000	1.56
  @@ -43,6 +43,22 @@
   dnl Initialize mkdir -p functionality.
   APR_MKDIR_P_CHECK($abs_srcdir/build/mkdir.sh)
   
  +dnl get our version information
  +get_version="$abs_srcdir/build/get-version.sh"
  +version_hdr="$abs_srcdir/include/apu_version.h"
  +APRUTIL_MAJOR_VERSION="`$get_version major $version_hdr APU`"
  +APRUTIL_DOTTED_VERSION="`$get_version all $version_hdr APU`"
  +
  +AC_SUBST(APRUTIL_DOTTED_VERSION)
  +AC_SUBST(APRUTIL_MAJOR_VERSION)
  +
  +echo "APR-util Version: ${APRUTIL_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-util)
  +APR_PARSE_ARGUMENTS
  +
   dnl load os-specific hints for apr-util
   APU_PRELOAD
   
  @@ -72,6 +88,9 @@
   lib_target=$APR_LIB_TARGET
   AC_SUBST(so_ext)
   AC_SUBST(lib_target)
  +
  +APRUTIL_LIBNAME="aprutil${libsuffix}"
  +AC_SUBST(APRUTIL_LIBNAME)
   
   EXTRA_OS_LINK=""
   host_alias=`uname -s`
  
  
  
  1.1                  apr-util/config.layout
  
  Index: config.layout
  ===================================================================
  ##
  ##  config.layout -- Pre-defined Installation Path Layouts
  ##
  ##  Hints:
  ##  - layouts can be loaded with configure's --enable-layout=ID option
  ##  - when no --enable-layout option is given, the default layout is `apr'
  ##  - a trailing plus character (`+') on paths is replaced with a 
  ##    `/<target>' suffix where <target> is currently hardcoded to 'apr'.
  ##    (This may become a configurable parameter at some point.)
  ##
  
  #   Classical APR-util path layout designed for parallel installs.
  <Layout apr-util>
      prefix:        /usr/local/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/modules
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
      localstatedir: ${prefix}
      libsuffix:     -${APRUTIL_MAJOR_VERSION}
  </Layout>
  
  #   Classical single-installation APR path layout.
  <Layout classic>
      prefix:        /usr/local/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/modules
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: ${prefix}
  </Layout>
  
  #   GNU standards conforming path layout.
  #   See FSF's GNU project `make-stds' document for details.
  <Layout GNU>
      prefix:        /usr/local
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/etc+
      datadir:       ${prefix}/share+
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include+
      localstatedir: ${prefix}/var+
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Mac OS X Server (Rhapsody)
  <Layout Mac OS X Server>
      prefix:        /Local/Library/WebServer
      exec_prefix:   /usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    /System/Library/apr/Modules
      mandir:        ${exec_prefix}/share/man
      sysconfdir:    ${prefix}/Configuration
      datadir:       ${prefix}
      installbuilddir: /System/Library/apr/Build
      includedir:    /System/Library/Frameworks/apr.framework/Versions/2.0/Headers
      localstatedir: /var
      runtimedir:    ${prefix}/Logs
  </Layout>
  
  #   Darwin/Mac OS Layout
  <Layout Darwin>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec+
      mandir:        ${prefix}/share/man
      datadir:       /Library/WebServer
      sysconfdir:    /etc+
      installbuilddir: ${prefix}/share/httpd/build
      includedir:    ${prefix}/include+
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Red Hat Linux 7.x layout
  <Layout RedHat>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${prefix}/bin
      sbindir:       ${prefix}/sbin
      libdir:        ${prefix}/lib
      libexecdir:    ${prefix}/lib/apr
      mandir:        ${prefix}/man
      sysconfdir:    /etc/httpd/conf
      datadir:       /var/www
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>     
  
  #   According to the /opt filesystem conventions
  <Layout opt>
      prefix:        /opt/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    /etc${prefix}
      datadir:       ${prefix}/share
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: /var${prefix}
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #  BeOS layout...
  <Layout beos>
      prefix:        /boot/home/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: ${prefix}
      runtimedir:    ${localstatedir}/logs
  </Layout>
  
  #   SuSE 6.x layout
  <Layout SuSE>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${prefix}/bin
      sbindir:       ${prefix}/sbin
      libdir:        ${prefix}/lib
      libexecdir:    ${prefix}/lib/apr
      mandir:        ${prefix}/share/man
      sysconfdir:    /etc/httpd
      datadir:       /usr/local/httpd
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr
      localstatedir: /var/lib/httpd
      runtimedir:    /var/run
  </Layout>
  
  #   BSD/OS layout
  <Layout BSDI>
      prefix:        /var/www
      exec_prefix:   /usr/contrib
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec/apr
      mandir:        ${exec_prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${exec_prefix}/include/apr
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Solaris 8 Layout
  <Layout Solaris>
      prefix:        /usr/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${exec_prefix}/man
      sysconfdir:    /etc/apr
      datadir:       /var/apr
      installbuilddir: ${datadir}/build
      includedir:    ${exec_prefix}/include
      localstatedir: ${prefix}
      runtimedir:    /var/run
  </Layout>
  
  #   OpenBSD Layout
  <Layout OpenBSD>
      prefix:        /var/www
      exec_prefix:   /usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/lib/apr/modules
      mandir:        ${exec_prefix}/share/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${prefix}/build
      includedir:    ${exec_prefix}/lib/apr/include
      localstatedir: ${prefix}
      runtimedir:    ${prefix}/logs
  </Layout>
  
  # Debian layout
  <Layout Debian>
      prefix:        
      exec_prefix:   ${prefix}/usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/lib/apr/modules
      mandir:        ${exec_prefix}/share/man
      datadir:       ${exec_prefix}/share/apr
      includedir:    ${exec_prefix}/include/apr
      localstatedir: ${prefix}/var/run
      runtimedir:    ${prefix}/var/run
      infodir:       ${exec_prefix}/share/info
  </Layout>
  
  
  
  1.1                  apr-util/build/get-version.sh
  
  Index: get-version.sh
  ===================================================================
  #!/bin/sh
  #
  # extract version numbers from a header file
  #
  # USAGE: get-version.sh CMD VERSION_HEADER PREFIX
  #   where CMD is one of: all, major, libtool
  #   where PREFIX is the prefix to {MAJOR|MINOR|PATCH}_VERSION defines
  #
  #   get-version.sh all returns a dotted version number
  #   get-version.sh major returns just the major version number
  #   get-version.sh libtool returns a version "libtool -version-info" format
  #
  
  if test $# != 3; then
    echo "USAGE: $0 CMD INCLUDEDIR PREFIX"
    echo "  where CMD is one of: all, major"
    exit 1
  fi
  
  major_sed="/#define.*$3_MAJOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  minor_sed="/#define.*$3_MINOR_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  patch_sed="/#define.*$3_PATCH_VERSION/s/^.*\([0-9][0-9]*\).*$/\1/p"
  major="`sed -n $major_sed $2`"
  minor="`sed -n $minor_sed $2`"
  patch="`sed -n $patch_sed $2`"
  
  if test "$1" = "all"; then
    echo ${major}.${minor}.${patch}
  elif test "$1" = "major"; then
    echo ${major}
  elif test "$1" = "libtool"; then
    # Yes, ${minor}:${patch}:${minor} is correct due to libtool idiocy.
    echo ${minor}:${patch}:${minor}
  else
    echo "ERROR: unknown version CMD ($1)"
    exit 1
  fi
  
  
  
  1.1                  apr-util/include/apu_version.h
  
  Index: apu_version.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #ifndef APU_VERSION_H
  #define APU_VERSION_H
  
  #include "apr_version.h"
  
  #include "apu.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  /**
   * @file apu_version.h
   * @brief 
   * 
   * APR-util's Version
   *
   * There are several different mechanisms for accessing the version. There
   * is a string form, and a set of numbers; in addition, there are constants
   * which can be compiled into your application, and you can query the library
   * being used for its actual version.
   *
   * Note that it is possible for an application to detect that it has been
   * compiled against a different version of APU by use of the compile-time
   * constants and the use of the run-time query function.
   *
   * APU version numbering follows the guidelines specified in:
   *
   *     http://apr.apache.org/versioning.html
   */
  
  /* The numeric compile-time version constants. These constants are the
   * authoritative version numbers for APU. 
   */
  
  /** major version 
   * Major API changes that could cause compatibility problems for older
   * programs such as structure size changes.  No binary compatibility is
   * possible across a change in the major version.
   */
  #define APU_MAJOR_VERSION       0
  
  /** 
   * Minor API changes that do not cause binary compatibility problems.
   * Should be reset to 0 when upgrading APU_MAJOR_VERSION
   */
  #define APU_MINOR_VERSION       9
  
  /** patch level */
  #define APU_PATCH_VERSION       1
  
  
  /** 
   *  This symbol is defined for internal, "development" copies of APU. This
   *  symbol will be #undef'd for releases. 
   */
  #define APU_IS_DEV_VERSION
  
  /** The formatted string of APU's version */
  #define APU_VERSION_STRING \
       APR_STRINGIFY(APU_MAJOR_VERSION) "." \
       APR_STRINGIFY(APU_MINOR_VERSION) "." \
       APR_STRINGIFY(APU_PATCH_VERSION) \
       APU_IS_DEV_STRING
  
  /**
   * Return APR-util's version information information in a numeric form.
   *
   *  @param pvsn Pointer to a version structure for returning the version
   *              information.
   */
  APU_DECLARE(void) apu_version(apr_version_t *pvsn);
  
  /** Return APU's version information as a string. */
  APU_DECLARE(const char *) apu_version_string(void);
  
  
  /** Internal: string form of the "is dev" flag */
  #ifdef APU_IS_DEV_VERSION
  #define APU_IS_DEV_STRING "-dev"
  #else
  #define APU_IS_DEV_STRING ""
  #endif
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif /* APU_VERSION_H */
  
  
  
  1.11      +1 -1      apr-util/misc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- Makefile.in	18 Aug 2002 20:41:08 -0000	1.10
  +++ Makefile.in	10 Sep 2002 10:10:50 -0000	1.11
  @@ -2,7 +2,7 @@
   
   INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
   
  -TARGETS = apr_date.lo apr_rmm.lo apr_reslist.lo apr_queue.lo
  +TARGETS = apr_date.lo apr_rmm.lo apr_reslist.lo apr_queue.lo apu_version.lo
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.1                  apr-util/misc/apu_version.c
  
  Index: apu_version.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr_general.h" /* for APR_STRINGIFY */
  
  #include "apu.h"
  #include "apu_version.h"
  
  APU_DECLARE(void) apu_version(apr_version_t *pvsn)
  {
      pvsn->major = APU_MAJOR_VERSION;
      pvsn->minor = APU_MINOR_VERSION;
      pvsn->patch = APU_PATCH_VERSION;
  #ifdef APU_IS_DEV_VERSION
      pvsn->is_dev = 1;
  #else
      pvsn->is_dev = 0;
  #endif
  }
  
  APU_DECLARE(const char *) apu_version_string(void)
  {
      return APU_VERSION_STRING;
  }
  
  
  
  1.33      +14 -10    apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -u -r1.32 -r1.33
  --- Makefile.in	5 Sep 2002 05:31:19 -0000	1.32
  +++ Makefile.in	10 Sep 2002 10:10:51 -0000	1.33
  @@ -6,6 +6,10 @@
   	testuuid testreslist testqueue
   TARGETS = $(PROGRAMS)
   
  +APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
  +APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
  +TARGET_LIB_PATH = ../lib@APRUTIL_LIBNAME@.la
  +
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   PROGRAM_DEPENDENCIES = @APRUTIL_LDFLAGS@ @APRUTIL_LIBS@
  @@ -22,52 +26,52 @@
   	done
   
   testdbm_OBJECTS = testdbm.lo
  -testdbm_LDADD =  ../libaprutil.la
  +testdbm_LDADD =  $(TARGET_LIB_PATH)
   testdbm: $(testdbm_OBJECTS) $(testdbm_LDADD)
   	$(LINK) $(testdbm_OBJECTS) $(testdbm_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testdate_OBJECTS = testdate.lo
  -testdate_LDADD =  ../libaprutil.la
  +testdate_LDADD =  $(TARGET_LIB_PATH)
   testdate: $(testdate_OBJECTS) $(testdate_LDADD)
   	$(LINK) $(testdate_OBJECTS) $(testdate_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testxml_OBJECTS = testxml.lo
  -testxml_LDADD =  ../libaprutil.la
  +testxml_LDADD =  $(TARGET_LIB_PATH)
   testxml: $(testxml_OBJECTS) $(testxml_LDADD)
   	$(LINK) $(testxml_OBJECTS) $(testxml_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testmd4_OBJECTS = testmd4.lo
  -testmd4_LDADD =  ../libaprutil.la
  +testmd4_LDADD =  $(TARGET_LIB_PATH)
   testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD)
   	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testmd5_OBJECTS = testmd5.lo
  -testmd5_LDADD =  ../libaprutil.la
  +testmd5_LDADD =  $(TARGET_LIB_PATH)
   testmd5: $(testmd5_OBJECTS) $(testmd5_LDADD)
   	$(LINK) $(testmd5_OBJECTS) $(testmd5_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testrmm_OBJECTS = testrmm.lo
  -testrmm_LDADD =  ../libaprutil.la
  +testrmm_LDADD =  $(TARGET_LIB_PATH)
   testrmm: $(testrmm_OBJECTS) $(testrmm_LDADD)
   	$(LINK) $(testrmm_OBJECTS) $(testrmm_LDADD) $(PROGRAM_DEPENDENCIES)
   
   teststrmatch_OBJECTS = teststrmatch.lo
  -teststrmatch_LDADD =  ../libaprutil.la
  +teststrmatch_LDADD =  $(TARGET_LIB_PATH)
   teststrmatch: $(teststrmatch_OBJECTS) $(teststrmatch_LDADD)
   	$(LINK) $(teststrmatch_OBJECTS) $(teststrmatch_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testuuid_OBJECTS = testuuid.lo
  -testuuid_LDADD =  ../libaprutil.la
  +testuuid_LDADD =  $(TARGET_LIB_PATH)
   testuuid: $(testuuid_OBJECTS) $(testuuid_LDADD)
   	$(LINK) $(testuuid_OBJECTS) $(testuuid_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testreslist_OBJECTS = testreslist.lo
  -testreslist_LDADD =  ../libaprutil.la
  +testreslist_LDADD =  $(TARGET_LIB_PATH)
   testreslist: $(testreslist_OBJECTS) $(testreslist_LDADD)
   	$(LINK) $(testreslist_OBJECTS) $(testreslist_LDADD) $(PROGRAM_DEPENDENCIES)
   
   testqueue_OBJECTS = testqueue.lo
  -testqueue_LDADD =  ../libaprutil.la
  +testqueue_LDADD =  $(TARGET_LIB_PATH)
   testqueue: $(testqueue_OBJECTS) $(testqueue_LDADD)
   	$(LINK) $(testqueue_OBJECTS) $(testqueue_LDADD) $(PROGRAM_DEPENDENCIES)
   
  
  
  

Mime
View raw message