jerenkrantz 01/12/11 22:46:45
Modified: . .cvsignore configure.in Makefile.in CHANGES
Added: . apr-config.in
Log:
apr-config is a shell script modeled after glib-config et al that allows
third-parties easy access to APR configuration parameters.
Reviewed by: Greg Stein
Revision Changes Path
1.11 +1 -0 apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 2001/10/15 22:56:55 1.10
+++ .cvsignore 2001/12/12 06:46:45 1.11
@@ -6,6 +6,7 @@
configure
libtool
APRVARS
+apr-config
LibD
LibR
Debug
1.386 +3 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- configure.in 2001/12/11 02:29:18 1.385
+++ configure.in 2001/12/12 06:46:45 1.386
@@ -1427,6 +1427,7 @@
include/apr.h
APRVARS
build/rules.mk
+ apr-config
],[
for i in $SAVE_FILES; do
if cmp -s $i $i.save 2>/dev/null; then
@@ -1436,6 +1437,8 @@
rm -f $i.save
done
])
+
+chmod +x apr-config
dnl #----------------------------- Fixup Makefiles for VPATH support
1.65 +4 -1 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.in 2001/12/11 17:46:32 1.64
+++ Makefile.in 2001/12/12 06:46:45 1.65
@@ -31,12 +31,13 @@
CLEAN_TARGETS =
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
- APRVARS libtool apr.exp
+ APRVARS libtool apr.exp apr-config
EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
\
exports.c export_vars.h
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -67,6 +68,8 @@
$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
$(LIBTOOL) --mode=install cp APRVARS $(libdir)
$(LIBTOOL) --mode=install cp apr.exp $(libdir)
+ $(LIBTOOL) --mode=install cp apr-config $(bindir)
+ chmod 755 $(bindir)/apr-config
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
for i in $(INSTALL_SUBDIRS); do \
( cd $$i ; $(MAKE) install ); \
1.196 +6 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- CHANGES 2001/12/09 00:52:19 1.195
+++ CHANGES 2001/12/12 06:46:45 1.196
@@ -1,5 +1,11 @@
Changes with APR b1
+ *) Add apr-config - a shell script to allow third-party programs
+ easy access to APR configuration parameters. [Justin Erenkrantz]
+
+ *) Add find_apr.m4 to allow third-party programs that use APR to
+ have a standard m4 macro for detection. [Greg Stein]
+
*) SEGV in apr_table_overlap [Brian Pane]
*) apr_array_copy speedup by removing the zero-fill [Brian Pane]
1.1 apr/apr-config.in
Index: apr-config.in
===================================================================
#!/bin/sh
PREFIX="@prefix@"
EXEC_PREFIX="@exec_prefix@"
LIBDIR="@libdir@"
INCLUDEDIR="@includedir@"
CC="@CC@"
CPP="@CPP@"
SHELL="@SHELL@"
CPPFLAGS="@EXTRA_CPPFLAGS@"
CFLAGS="@EXTRA_CFLAGS@"
LDFLAGS="@EXTRA_LDFLAGS@"
LIBS="@EXTRA_LIBS@"
INCLUDES="@EXTRA_INCLUDES@"
LIBTOOL_LIBS="@LIBTOOL_LIBS@"
SHLIBPATH_VAR="@shlibpath_var@"
APR_SOURCE_DIR="@abs_srcdir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
show_usage()
{
cat << EOF
Usage: apr-config [OPTION]
Known values for OPTION are:
--prefix=DIR change prefix to DIR
--cflags print C compiler flags
--cppflags print cpp flags
--includes print include information
--ldflags print linker flags
--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
;;
--cflags)
echo $CFLAGS
;;
--cppflags)
echo $CPPFLAGS
;;
--libs)
echo $LIBS
;;
--ldflags)
echo $LDFLAGS
;;
--includes)
echo $INCLUDES
;;
--help)
show_usage
exit 1
;;
*)
show_usage
exit 1
;;
esac
# Next please.
shift
done
exit 0
