gstein 2002/08/22 13:34:16
Modified: . CHANGES Makefile.in config.layout configure.in
build apr_common.m4
Log:
* substitute APR_MAJOR_VERSION to the Makefile so that other
substitutions can refer to it (eg. APR_LIBNAME)
* add a param to APR_ENABLE_LAYOUT to specify the default ("apr" in
our case, not "Apache")
* change the default APR layout to support parallel installation;
rename the old layout to "classic"
Revision Changes Path
1.323 +12 -2 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- CHANGES 21 Aug 2002 17:37:12 -0000 1.322
+++ CHANGES 22 Aug 2002 20:34:16 -0000 1.323
@@ -1,4 +1,11 @@
-Changes with APR b1
+Changes with APR 0.9.0
+
+ *) Includes moved to INCLUDEDIR/apr-{major} (e.g. /usr/include/apr-0)
+ [Greg Stein]
+
+ *) libtool versioning is used to give the library sonames a real
+ value. The libraries will be libapr-{major}.so.0.{minor}.{patch}
+ [Greg Stein]
*) Fix apr_tokenize_to_argv() to remove the escape character
(backslash) from the argument tokens. PR 11793 [Paul J. Reder]
@@ -11,7 +18,7 @@
*) 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.
+ which version they want to use and link against. [Greg Stein]
*) Add --version to apr-config so that apps can retrieve the version
information of the (installed) APR. [Greg Stein]
@@ -1115,6 +1122,7 @@
supports IPv6 and will be friendlier for use with eventual
SOCK_DGRAM support. apr_get_hostname() is gone. [Jeff Trawick]
+
Changes with APR a9
*) Removed the iconv implementation from the i18n/unix/iconv branch.
@@ -1170,7 +1178,9 @@
*) Get APR_OFF_T_FMT defined properly on Solaris Sparc.
[Jeff Trawick]
+
Changes with APR a8
+
*) Change the name of the sa_len field in apr_sockaddr_t to salen.
Some platforms have a macro named sa_len.
[Tony Finch]
1.82 +3 -0 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile.in 14 Aug 2002 17:15:15 -0000 1.81
+++ Makefile.in 22 Aug 2002 20:34:16 -0000 1.82
@@ -3,6 +3,9 @@
#
CPP = @CPP@
+# get get substituted into some targets
[EMAIL PROTECTED]@
+
#
# Macros for supporting directories
#
1.3 +7 -7 apr/config.layout
Index: config.layout
===================================================================
RCS file: /home/cvs/apr/config.layout,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.layout 19 Aug 2002 06:33:09 -0000 1.2
+++ config.layout 22 Aug 2002 20:34:16 -0000 1.3
@@ -9,7 +9,7 @@
## (This may become a configurable parameter at some point.)
##
-# Classical apr path layout.
+# Classical APR path layout designed for parallel installs.
<Layout apr>
prefix: /usr/local/apr
exec_prefix: ${prefix}
@@ -21,25 +21,25 @@
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION}
localstatedir: ${prefix}
+ libsuffix: -${APR_MAJOR_VERSION}
</Layout>
-# Classical apr path layout designed for parallel installs.
-<Layout parallel-apr>
+# 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/apr-${APR_MAJOR_VERSION}
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/modules
mandir: ${prefix}/man
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION}
+ includedir: ${prefix}/include
localstatedir: ${prefix}
- libsuffix: -${APR_MAJOR_VERSION}
</Layout>
# GNU standards conforming path layout.
1.479 +3 -3 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- configure.in 19 Aug 2002 06:33:09 -0000 1.478
+++ configure.in 22 Aug 2002 20:34:16 -0000 1.479
@@ -77,9 +77,9 @@
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
+dnl Enable the layout handling code, then reparse the prefix-style
+dnl arguments due to autoconf being a PITA.
+APR_ENABLE_LAYOUT(apr)
APR_PARSE_ARGUMENTS
dnl Set optional CC hints here in case autoconf makes an inappropriate
choice.
1.41 +2 -2 apr/build/apr_common.m4
Index: apr_common.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_common.m4,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- apr_common.m4 19 Aug 2002 06:33:10 -0000 1.40
+++ apr_common.m4 22 Aug 2002 20:34:16 -0000 1.41
@@ -707,7 +707,7 @@
])dnl
dnl
-dnl APR_ENABLE_LAYOUT
+dnl APR_ENABLE_LAYOUT(default layout name)
dnl
AC_DEFUN(APR_ENABLE_LAYOUT,[
AC_ARG_ENABLE(layout,
@@ -716,7 +716,7 @@
])
if test -z "$LAYOUT"; then
- LAYOUT="Apache"
+ LAYOUT="$1"
fi
APR_LAYOUT($srcdir/config.layout, $LAYOUT)
