You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/03/09 20:29:19 UTC
cvs commit: httpd-2.0 CHANGES Makefile.in configure.in
jerenkrantz 02/03/09 11:29:19
Modified: . CHANGES Makefile.in configure.in
Log:
Stop copying APR's libtool. And pass enough parameters to apr's subconfig
so that it can figure out where we would like libtool to be installed.
Revision Changes Path
1.627 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- CHANGES 9 Mar 2002 07:15:33 -0000 1.626
+++ CHANGES 9 Mar 2002 19:29:18 -0000 1.627
@@ -1,5 +1,9 @@
Changes with Apache 2.0.34-dev
+ *) Stop installing libtool for APR and tell APR where it should place
+ its copy of libtool (via our installbuildpath layout variable).
+ [Justin Erenkrantz]
+
*) New directive ProxyIOBufferSize. Sets the size of the buffer used
when reading from a remote HTTP server in proxy. [Graham Leggett]
1.101 +1 -5 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile.in 7 Mar 2002 15:06:07 -0000 1.100
+++ Makefile.in 9 Mar 2002 19:29:18 -0000 1.101
@@ -89,11 +89,7 @@
@sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
config_vars.mk > $(installbuilddir)/config_vars.mk; \
cp build/*.mk $(installbuilddir); \
- cp $(top_srcdir)/build/instdso.sh $(installbuilddir); \
- cp srclib/apr/libtool $(installbuilddir); \
- if test -f srclib/apr/shlibtool; then \
- cp srclib/apr/shlibtool $(installbuilddir); \
- fi
+ cp $(top_srcdir)/build/instdso.sh $(installbuilddir);
htdocs-srcdir = $(top_srcdir)/docs/docroot
1.209 +1 -1 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- configure.in 8 Mar 2002 18:00:40 -0000 1.208
+++ configure.in 9 Mar 2002 19:29:18 -0000 1.209
@@ -56,7 +56,7 @@
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir")
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"