You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2002/01/17 01:50:12 UTC
cvs commit: apr-util apu-config.in .cvsignore CHANGES Makefile.in configure.in
jerenkrantz 02/01/16 16:50:12
Modified: . .cvsignore CHANGES Makefile.in configure.in
Added: . apu-config.in
Log:
Add apu-config - this is essentially APR's apr-config geared for apr-util.
Revision Changes Path
1.12 +1 -0 apr-util/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr-util/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 15 Oct 2001 23:36:37 -0000 1.11
+++ .cvsignore 17 Jan 2002 00:50:12 -0000 1.12
@@ -12,6 +12,7 @@
exports.c
export_vars.h
export_vars.sh
+apu-config
Debug
Release
LibD
1.49 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- CHANGES 11 Jan 2002 01:30:17 -0000 1.48
+++ CHANGES 17 Jan 2002 00:50:12 -0000 1.49
@@ -1,5 +1,8 @@
Changes with APR-util b1
+ *) Add apu-config - a shell script to allow third-party programs
+ easy access to APR configuration parameters. [Justin Erenkrantz]
+
*) Add GMT offset calculation to apr_date_parse_rfc().
[Justin Erenkrantz]
1.57 +7 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.56
+++ Makefile.in 17 Jan 2002 00:50:12 -0000 1.57
@@ -23,12 +23,13 @@
DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
include/private/apu_config.h include/private/apu_private.h \
include/private/apu_select_dbm.h include/apu.h export_vars.sh \
- aprutil.exp
+ aprutil.exp apu-config
EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
exports.c export_vars.h
prefix=@prefix@
exec_prefix=@exec_prefix@
+bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
top_srcdir=@top_srcdir@
@@ -55,6 +56,11 @@
fi; \
$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir); \
$(LIBTOOL) --mode=install cp aprutil.exp $(libdir); \
+ if [ ! -d $(bindir) ]; then \
+ @APR_SOURCE_DIR@/build/mkdir.sh $(bindir); \
+ fi; \
+ $(LIBTOOL) --mode=install cp apu-config $(bindir); \
+ chmod 755 $(bindir)/apu-config; \
list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
( cd $$i ; $(MAKE) install ); \
done
1.42 +3 -0 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- configure.in 4 Jan 2002 21:54:49 -0000 1.41
+++ configure.in 17 Jan 2002 00:50:12 -0000 1.42
@@ -117,8 +117,11 @@
MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile $test_Makefile"
AC_OUTPUT([
export_vars.sh
+ apu-config
include/private/apu_select_dbm.h
include/apr_ldap.h
include/apu.h
$MAKEFILES
])
+
+chmod +x apu-config
1.1 apr-util/apu-config.in
Index: apu-config.in
===================================================================
#!/bin/sh
# ====================================================================
# The Apache Software License, Version 1.1
#
# Copyright (c) 2001 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/>.
# APR-util script designed to allow easy command line access to APR-util
# configuration parameters.
PREFIX="@prefix@"
EXEC_PREFIX="@exec_prefix@"
BINDIR="@bindir@"
LIBDIR="@libdir@"
TOP_SRCDIR="@top_srcdir@"
LIBS="@APRUTIL_EXPORT_LIBS@"
show_usage()
{
cat << EOF
Usage: apu-config [OPTION]
Known values for OPTION are:
--prefix[=DIR] change prefix to DIR
--libs print library information
--help print this help
EOF
}
if test $# -eq 0; then
show_usage
exit 1
fi
while test $# -gt 0; do
# Normalize the prefix.
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case "$1" in
# It is possible for the user to override our prefix.
--prefix=*)
prefix=$optarg
;;
--prefix)
echo $PREFIX
;;
--libs)
if [ -f $PREFIX/lib/libexpat.la ] ; then
TMP_SRCDIR=`echo "$TOP_SRCDIR/xml/expat" | sed 's/\\//\\\\\\//g'`
TMP_PREFIX=`echo $PREFIX | sed 's/\\//\\\\\\//g'`
LIBS=`echo "$LIBS" | sed "s/$TMP_SRCDIR/$TMP_PREFIX/g"`
fi
echo "$LIBS"
;;
--help)
show_usage
exit 1
;;
*)
show_usage
exit 1
;;
esac
# Next please.
shift
done
exit 0