From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Mon, 28 Jul 2003 01:50:56 +0000 (+0000)
Subject: steal some code from APR intended to allow you to properly switch
X-Git-Tag: 2.0.48~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c0926f4101edb1ce93ca98318b94ed222fca9cc;p=thirdparty%2Fapache%2Fhttpd.git

steal some code from APR intended to allow you to properly switch
between libtool 1.3 and 1.4+...  newer libtool doesn't have ltconfig,
so having a stray ltconfig around will confuse some of our config
logic

This also fixes cp failure on FreeBSD since ltconfig and ltmain.sh
are installed with 0400 perms, and when buildconf is run a second time
the cp of those files would fail.

Submitted by:	Jeff Trawick
Reviewed by:	Justin Erenkrantz, Sander Striker


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

diff --git a/CHANGES b/CHANGES
index 7ecf00682e3..d584253b9ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.48
 
+  *) Fix buildconf errors when libtool version changes.  [Jeff Trawick]
+
   *) Remember an authenticated user during internal redirects if the
      redirection target is not access protected and pass it
      to scripts using the REDIRECT_REMOTE_USER environment variable.
diff --git a/build/.cvsignore b/build/.cvsignore
index 7a8722aa60b..80c398c9725 100644
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -3,4 +3,5 @@ config_vars.mk
 apr_common.m4
 find_apr.m4
 find_apu.m4
+ltconfig
 ltmain.sh
diff --git a/buildconf b/buildconf
index 2bae97539ca..65f5a0087b1 100755
--- a/buildconf
+++ b/buildconf
@@ -162,6 +162,10 @@ 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
 
+# Remove any libtool files so one can switch between libtool 1.3
+# and libtool 1.4 by simply rerunning the buildconf script.
+(cd build ; rm -f ltconfig ltmain.sh)
+
 # Optionally copy libtool-1.3.x files
 if [ -f $apr_src_dir/build/ltconfig ]; then
     cp $apr_src_dir/build/ltconfig build