You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/03/25 12:51:31 UTC
cvs commit: httpd-2.0 STATUS buildconf
trawick 2003/03/25 03:51:30
Modified: . Tag: APACHE_2_0_BRANCH STATUS buildconf
Log:
get changes to support libtool 1.3 into APACHE_2_0_BRANCH
Submitted by: Greg Ames
Reviewed by: wrowe, trawick
Revision Changes Path
No revision
No revision
1.751.2.183 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.182
retrieving revision 1.751.2.183
diff -u -r1.751.2.182 -r1.751.2.183
--- STATUS 22 Mar 2003 22:21:24 -0000 1.751.2.182
+++ STATUS 25 Mar 2003 11:51:27 -0000 1.751.2.183
@@ -180,10 +180,6 @@
1.0: nd
0.0:
- * get out-of-tree APR builds to work for libtool 1.3.x users
- buildconf: r1.32
- +1: trawick
-
* Fix chinese default page. PR 18025. (2.0 + 1.3)
docs/conf/httpd-std.conf.in: r1.35
docs/conf/httpd-win.conf: r1.81
1.27.2.4 +8 -0 httpd-2.0/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/httpd-2.0/buildconf,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -r1.27.2.3 -r1.27.2.4
--- buildconf 11 Mar 2003 07:07:52 -0000 1.27.2.3
+++ buildconf 25 Mar 2003 11:51:28 -0000 1.27.2.4
@@ -162,6 +162,14 @@
$apr_src_dir/build/PrintPath $apr_src_dir/build/apr_common.m4 \
$apr_src_dir/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
+# Optionally copy libtool-1.3.x files
+if [ -f $apr_src_dir/build/ltconfig ]; then
+ cp $apr_src_dir/build/ltconfig build
+fi
+if [ -f $apr_src_dir/build/ltmain.sh ]; then
+ cp $apr_src_dir/build/ltmain.sh build
+fi
+
echo rebuilding $pcre_configure
(cd srclib/pcre && ${AUTOCONF:-autoconf})