get changes to support libtool 1.3 into APACHE_2_0_BRANCH

Submitted by:	Greg Ames
Reviewed by:	wrowe, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@99058 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index ec6695c1de59cdecd1c9520a69f15b7cc1a41d7e..7a0e306420b0fdcf21d3e9af25a6af146e0c0c1c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/03/22 22:21:24 $]
+Last modified at [$Date: 2003/03/25 11:51:27 $]
 
 Release:
 
@@ -180,10 +180,6 @@ PATCHES TO PORT FROM 2.1
          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

diff --git a/buildconf b/buildconf
index 1b9f3e35a74598ce49938a0563ed3c89d53efb53..71808600d0594b84a63d988a66e33d0e5e40cd8d 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -162,6 +162,14 @@ cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \
    $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})